diff --git a/src/views/insight/index.vue b/src/views/insight/index.vue
index 7f3c0f5..7dc94f4 100644
--- a/src/views/insight/index.vue
+++ b/src/views/insight/index.vue
@@ -57,13 +57,24 @@
       </div>
     </div>
     <!-- bmi显示/输入 TODO待接口-->
-    <!-- <div class="bmi" v-show="signActive == 2">
-      <p>身高:<span>170</span>cm</p>
-      <p>体重:<span>60</span>kg</p>
-      <p>BMI:<span>24.5</span></p>
+    <div class="bmi" v-show="signActive == 2">
+      <p>身高:<span>{{ bmi.height }}</span>cm</p>
+      <p>体重:<span>{{ bmi.weight }}</span>kg</p>
+      <p>BMI:<span>{{ bmi.value }}</span></p>
       <p>{{ bmi.result }}</p>
-      <van-button size="mini">更新</van-button>
-    </div> -->
+      <van-button size="mini" @click="onUpdateBmi">更新</van-button>
+    </div>
+    <van-dialog v-model="bmi.isBmiShow" title="请输入身高和体重" confirm-button-color="#179b3b" cancel-button-text="关闭"
+      show-cancel-button @confirm="onConfirmBmi">
+      <div class="bmiDialog">
+        <van-cell-group>
+          <van-field v-model="bmi.height" label="身高：" type="number" maxlength="3" placeholder="请输入身高" border
+            input-align="left" />
+          <van-field v-model="bmi.weight" label="体重：" type="number" maxlength="3" placeholder="请输入体重" border
+            input-align="left" />
+        </van-cell-group>
+      </div>
+    </van-dialog>
     <div class="title-out">
       <span>{{ signsChartTitle }}</span>
     </div>
@@ -98,8 +109,8 @@
               <p>总步数：{{ stepsData.total || '--' }}</p>
             </div>
             <div class="right">
-              <img :src="stepsData.lastStepTotalCompare > 0 ? upImg : downImg" alt="" />
-              <span>{{ Math.abs(stepsData.lastStepTotalCompare) || '--' }}</span>
+              <img :src="stepsData.compare > 0 ? upImg : downImg" alt="" />
+              <span>{{ Math.abs(stepsData.compare) || '--' }}</span>
             </div>
           </div>
           <div class="text">
@@ -107,8 +118,8 @@
               <p>平均步数：{{ stepsData.avg || '--' }}</p>
             </div>
             <div class="right">
-              <img :src="stepsData.lastStepAvgCompare > 0 ? upImg : downImg" alt="" />
-              <span>{{ Math.abs(stepsData.lastStepAvgCompare) || '--' }}</span>
+              <img :src="stepsData.compare > 0 ? upImg : downImg" alt="" />
+              <span>{{ Math.abs(stepsData.compare) || '--' }}</span>
             </div>
           </div>
         </div>
@@ -124,8 +135,8 @@
               <p>总消耗：{{ calorieData.total || '--' }}</p>
             </div>
             <div class="right">
-              <img :src="calorieData.lastCalorieTotalCompare > 0 ? upImg : downImg" alt="" />
-              <span>{{ Math.abs(calorieData.lastCalorieTotalCompare) || '--' }}</span>
+              <img :src="calorieData.compare > 0 ? upImg : downImg" alt="" />
+              <span>{{ Math.abs(calorieData.compare) || '--' }}</span>
             </div>
           </div>
           <div class="text">
@@ -133,8 +144,8 @@
               <p>平均消耗：{{ calorieData.avg || '--' }}</p>
             </div>
             <div class="right">
-              <img :src="calorieData.lastCalorieAvgCompare > 0 ? upImg : downImg" alt="" />
-              <span>{{ Math.abs(calorieData.avg) || '--' }}</span>
+              <img :src="calorieData.compare > 0 ? upImg : downImg" alt="" />
+              <span>{{ Math.abs(calorieData.compare) || '--' }}</span>
             </div>
           </div>
         </div>
@@ -252,7 +263,8 @@ export default {
         height: '170',
         weight: '57',
         value: '24.5',
-        result: '肥胖'
+        result: '肥胖',
+        isBmiShow: false,
       },
       upImg: require('@/assets/today/icons/up.png'),
       downImg: require('@/assets/today/icons/down.png'),
@@ -284,7 +296,8 @@ export default {
       signData: {},
       signDaysList: [],
       stepsData: {},
-      calorieData: {}
+      calorieData: {},
+
     };
   },
   created() {
@@ -718,6 +731,7 @@ export default {
                 value: [index, item.MinValue, item.MaxValue]
               };
             });
+            console.log("this.weekAndMonData", this.weekAndMonData);
             // x轴显示数据
             if (this.currentDays === 0) {
               // 显示今天数据
@@ -928,10 +942,6 @@ export default {
     },
     initData() {
       //初始化图表
-      /* if (!this.emotionChart) {
-        this.emotionChart = this.$echarts.init(document.getElementById('emotionChart'));
-      } */
-
       if (!this.signChart) {
         this.signChart = this.$echarts.init(document.getElementById('signChart'));
       }
@@ -942,7 +952,6 @@ export default {
         this.calorieChart = this.$echarts.init(document.getElementById('calorieChart'));
       }
       //渲染图表
-      /* this.initEmotionChart(); */
       this.initSignChart();
     },
     initEmotionChart() {
@@ -990,24 +999,25 @@ export default {
       let data = await this.getReportData('', this.date.start, this.date.end);
       if (this.signActive == 0) {
         //测试
-        this.formateHeartRateData(option, data.day);
+        this.formateHeartRateData(option, data.days);
         this.signChart.setOption(option);
       } else if (this.signActive == 1) {
         //测试
-        this.formateTemperatureData(option, data.day);
+        this.formateTemperatureData(option, data.days);
         this.signChart.setOption(option);
       } else if (this.signActive == 2) {
         option = this.getOption(false);
         let option2 = this.getOption(false);
         let data2 = await this.getReportData(3, this.date.start, this.date.end);
-        this.stepsData = { ...data };
-        this.calorieData = { ...data2 };
+        this.stepsData = { ...data.stepTotal, ...data.stepAvg };
+        this.calorieData = { ...data2.calorieTotal, ...data2.calorieAvg };
 
-        this.formateStepData(option, data.day);
-        this.formateCalorieData(option2, data2.day);
+        this.formateStepData(option, data.days);
+        this.formateCalorieData(option2, data2.days);
 
         this.stepChart.setOption(option);
         this.calorieChart.setOption(option2);
+        console.log("this.calorieData", this.calorieData);
       }
     },
     formateEmotionData(option, data) {
@@ -1060,24 +1070,11 @@ export default {
       let xdata = [];
       let ydata = [];
       let fill = [];
-      let max = 0;
-      data.forEach(item => {
-        if (item.value > max) {
-          max = item.value || '--';
-        }
-      });
-      data.forEach(item => {
-        xdata.push(item.date);
-        fill.push({
-          value: max - item.value || '--',
-          label: {
-            show: false
-          },
-          itemStyle: {
-            borderWidth: 3,
-            borderColor: this.calcColorByEvaluate(item.evaluate)
-          }
-        });
+      data.forEach((item) => {
+        xdata.push(item.key);
+        /* fill.push({
+          value: [index, Number(item.valueMax) || '--', Number(item.valueMin) || '--'],
+        }); */
         ydata.push({
           value: item.value || '--',
           label: {
@@ -1085,13 +1082,47 @@ export default {
           },
           itemStyle: {
             borderWidth: 3,
-            borderColor: this.calcColorByEvaluate(item.evaluate)
+            borderColor: this.calcColorByEvaluate(item.level)
           }
-        });
+        },
+        );
       });
+      fill = data.map((item, index) => {
+        return {
+          value: [index, item.valueMin || '--', item.valueMax || '--']
+        };
+      })
       option.xAxis.data = xdata;
       option.series[0].data = ydata;
-      /* option.series[1].data = fill; */
+      option.series[1].data = fill;
+      option[0] =
+        option.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]
+            );
+          }
+        };
       // 规定最小值
       option.yAxis.min = 40;
       // 规定最大值
@@ -1113,15 +1144,6 @@ export default {
         ]
       };
     },
-    formateHeartRateColor(value) {
-      if (value > 120) {
-        return this.heartRateMap.get('偏高');
-      } else if (value >= 60) {
-        return this.heartRateMap.get('正常');
-      } else {
-        return this.heartRateMap.get('偏低');
-      }
-    },
     formateTemperatureData(option, data) {
       let xdata = [];
       let ydata = [];
@@ -1133,17 +1155,8 @@ export default {
         }
       });
       data.forEach(item => {
-        xdata.push(item.date);
-        fill.push({
-          value: max - item.value || '--',
-          label: {
-            show: false
-          },
-          itemStyle: {
-            borderWidth: 3,
-            borderColor: this.calcColorByEvaluate(item.evaluate)
-          }
-        });
+        xdata.push(item.key);
+
         ydata.push({
           value: item.value || '--',
           label: {
@@ -1151,10 +1164,15 @@ export default {
           },
           itemStyle: {
             borderWidth: 3,
-            borderColor: this.calcColorByEvaluate(item.evaluate)
+            borderColor: this.calcColorByEvaluate(item.level)
           }
         });
       });
+      fill = data.map((item, index) => {
+        return {
+          value: [index, item.valueMin || '--', item.valueMax || '--']
+        };
+      })
       option.xAxis.data = xdata;
       option.series[0].data = ydata;
       option.series[0].markLine = {
@@ -1175,24 +1193,46 @@ export default {
           },
         ],
       }
+      option.series[1].data = fill;
+      option[0] =
+        option.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]
+            );
+          }
+        };
       /* option.series[1].data = fill; */
       // 规定最小值
       option.yAxis.min = 34.5;
       // 规定最大值
       option.yAxis.max = 42.5;
     },
-    formateTemperatureColor(value) {
-      if (value > 38) {
-        return this.temperatureMap.get('发烧');
-      } else {
-        return this.temperatureMap.get('正常');
-      }
-    },
     formateStepData(option, data) {
       let xdata = [];
       let ydata = [];
       data.forEach(item => {
-        xdata.push(item.date);
+        xdata.push(item.key);
         ydata.push({
           value: item.value,
           label: {
@@ -1200,7 +1240,7 @@ export default {
           },
           itemStyle: {
             borderWidth: 3,
-            borderColor: this.calcColorByEvaluate(item.evaluate)
+            borderColor: this.calcColorByEvaluate(item.level)
           }
         });
       });
@@ -1213,7 +1253,7 @@ export default {
       let xdata = [];
       let ydata = [];
       data.forEach(item => {
-        xdata.push(item.date);
+        xdata.push(item.key);
         ydata.push({
           value: item.value,
           label: {
@@ -1221,7 +1261,7 @@ export default {
           },
           itemStyle: {
             borderWidth: 3,
-            borderColor: this.calcColorByEvaluate(item.evaluate)
+            borderColor: this.calcColorByEvaluate(item.level)
           }
         });
       });
@@ -1231,6 +1271,77 @@ export default {
       option.yAxis.show = false;
     },
     getOption(/* point = true */) {
+      let that = this;
+      let chartSeries = [];
+      if (this.signActive === 0 || this.signActive === 1) {
+        chartSeries = [
+          {
+            name: '平均值',
+            type: 'scatter',
+            symbolSize: 14,
+          },
+          {
+            name: '',
+            type: 'custom',
+            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 = [20];
+              }
+              return (
+                rectShape && {
+                  type: 'rect',
+                  shape: rectShape,
+                  style: api.style()
+                }
+              );
+            },
+            itemStyle: {
+              opacity: 0.8
+            },
+            encode: {
+              y: [1, 2],
+              x: 0
+            }
+          },
+        ]
+      } else {
+        chartSeries = [
+          {
+            type: 'line',
+            padding: 10,
+            smooth: true,
+            symbol: 'circle',
+            symbolSize: 10,
+            itemStyle: {
+              color: '#fff',
+              borderWidth: 4
+            },
+            lineStyle: {
+              width: 6,
+              type: 'solid',
+              color: '#189b3b'
+            }
+          },
+        ]
+      }
       let option = {
         grid: {
           show: true,
@@ -1309,39 +1420,10 @@ export default {
             align: 'center'
           },
           formatter: function (params) {
-            console.log("params", params);
             return params[0].marker + params[0].name + '</br>' + params[0].value;
           }
         },
-        series: [
-          {
-            type: 'line',
-            padding: 10,
-            smooth: true,
-            symbol: 'circle',
-            symbolSize: 10,
-            itemStyle: {
-              color: '#fff',
-              borderWidth: 4
-            },
-            lineStyle: {
-              width: 6,
-              type: 'solid',
-              color: '#189b3b'
-            }
-          },
-          /* {
-            type: 'bar',
-            barMaxWidth: 15,
-            stack: 'value',
-            stackStrategy: 'all',
-            animation: false,
-            itemStyle: {
-              borderRadius: [12, 12, 0, 0],
-              show: false
-            }
-          } */
-        ]
+        series: chartSeries
       };
 
       /* if (!point) {
@@ -1394,15 +1476,19 @@ export default {
       let color = '';
       const intValue = Number(value);
       switch (intValue) {
-        case 1:
+        case 2:
           // 偏高
           color = '#ff5f8b';
           break;
-        case 2:
+        case 1:
           // 正常
           color = '#189b3b';
           break;
-        case 3:
+        case 99:
+          // 正常
+          color = '#189b3b';
+          break;
+        case 0:
           // 偏低
           color = '#2ea7e0';
           break;
@@ -1424,9 +1510,9 @@ export default {
       };
       return new Promise(resolve => {
         APIHealthUser.getReportData(reqBody).then(res => {
-          if (res.data.data.day) {
-            res.data.data.day = res.data.data.day.map(item => {
-              item.date = this.$dayjs(item.date).format('MM-DD');
+          if (res.data.data.days) {
+            res.data.data.days = res.data.data.days.map(item => {
+              item.key = this.$dayjs(item.key).format('MM-DD');
               return item;
             });
           }
@@ -1434,20 +1520,41 @@ export default {
 
           if (this.signActive === 1) {
             this.signDaysList = [
-              { day: res.data.data.normal, name: '正常', color: '#189b3b' },
-              { day: res.data.data.fever, name: '偏高', color: '#ff5f8b' }
+              {
+                day: res.data.data.normalDay.normalDay, name: '正常', color: '#189b3b'
+              },
+              { day: res.data.data.highDay.highDay, name: '偏高', color: '#ff5f8b' }
               /*  { day: res.data.data.low, name: '偏低', color: '#2ea7e0' } */
             ];
+          } else if (this.signActive === 0) {
+            this.signDaysList = [
+              {
+                day: res.data.data.normalDay
+                  .normalDay, name: '正常', color: '#189b3b'
+              },
+              { day: res.data.data.highDay.highDay, name: '偏高', color: '#ff5f8b' },
+              { day: res.data.data.lowDay.lowDay, name: '偏低', color: '#2ea7e0' }
+            ];
           } else {
             this.signDaysList = [
-              { day: res.data.data.normal, name: '正常', color: '#189b3b' },
-              { day: res.data.data.high, name: '偏高', color: '#ff5f8b' },
-              { day: res.data.data.low, name: '偏低', color: '#2ea7e0' }
+              {
+                day: res.data.data.normalDay, name: '正常', color: '#189b3b'
+              },
+              { day: res.data.data.highDay, name: '偏高', color: '#ff5f8b' },
+              { day: res.data.data.lowDay, name: '偏低', color: '#2ea7e0' }
             ];
           }
           resolve(res.data.data);
         });
       });
+    },
+    // 更新bmi
+    onUpdateBmi() {
+      // 打开输入弹窗
+      this.bmi.isBmiShow = true;
+    },
+    onConfirmBmi() {
+
     }
   }
 };
@@ -1519,7 +1626,7 @@ export default {
 
     .van-button {
       padding: 5px 10px;
-      margin-left: 50px;
+      margin-left: 10px;
       font-size: 12px;
       color: #fff;
       border-radius: 30px;
@@ -1527,6 +1634,15 @@ export default {
     }
   }
 
+  .bmiDialog {
+    padding: 40px 60px;
+    @include center();
+
+    .van-cell .van-field {
+      margin: 20px 0 !important;
+    }
+  }
+
   .label {
     font-size: 36px;
     font-weight: bold;
diff --git a/src/views/insight/signsReport.vue b/src/views/insight/signsReport.vue
index 49f9d90..fa40d9a 100644
--- a/src/views/insight/signsReport.vue
+++ b/src/views/insight/signsReport.vue
@@ -1,7 +1,7 @@
 <!--  -->
 
 <template>
-  <div class="report ">
+  <div class="pageContent report ">
     <NavBar :title="navTitle" @on-click-left="onNavBack" right-text=""> </NavBar>
     <!-- 日期切换 -->
     <div class="periodSwitch">
@@ -19,7 +19,7 @@
     <div class="psy-tab-bar">
       <div class="psy-tab-con">
         <div class="psy-tab-list">
-          <div :class="['psy-tab-item', { active: psyCurrent === index, notClick: false }]"
+          <div :class="['psy-tab-item', { active: signActive === index, notClick: false }]"
             @click="onPsyTabClick(item, index)" v-for="(item, index) in psyList" :key="index">
             <span>{{ item.text }}</span>
           </div>
@@ -27,7 +27,7 @@
       </div>
     </div>
     <div class="main">
-      <div class="pie-chart-con">
+      <div class="pie-chart-con" v-show="signActive !== 2">
         <div class="pie-chart-left">
           <div id="pieChart" ref="pieChart"></div>
         </div>
@@ -42,15 +42,26 @@
               </div>
 
               <div class="item-right">
-                <span :style="{ color: item.color }">{{ item.count ? item.count + '天' : `0天` }}</span>
-                <label :style="{ color: item.color }">{{ '(' + item.percentage + ')' }}%</label>
+                <span :style="{ color: item.color }">{{ item.count ? item.count + '次' : '0次' }}</span>
+                <label :style="{ color: item.color }">{{
+      item.percentage ? '(' + item.percentage + '%' + ')' : '(0%)'
+    }}</label>
+              </div>
+
+              <div class="status">
+                <img :src="item.compare != 0 ? item.compare > 0 ? upImg : downImg : ''" alt="" />
+                <span :style="{ color: item.compare > 0 ? item.color : '' }">{{
+      item.compare != 0
+        ? Math.abs(item.compare * 10) + '%'
+        : '持平'
+    }}</span>
               </div>
             </div>
           </div>
         </div>
       </div>
 
-      <div class="statistics">
+      <div class="statistics" v-show="signActive !== 2">
         <div class="list">
           <div class="item" v-for="(item, index) in statisticsList" :key="index"
             :style="{ backgroundColor: item.bgColor }">
@@ -72,32 +83,117 @@
       <div class="bottom">
 
         <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 class="title-out">
+            <span>{{ signsChartTitle }}</span>
+          </div>
+          <div class="ChatBox" :class="{ hiddenChart: signActive == 2 }">
+            <div class=" legendBox minLegendBox">
+              <div class="legend">
+                <div class="legendItem" :class="item.type" v-for="( item, index ) in  signGrid " :key="index">
+                  <span>{{ item.name }}</span>
+                </div>
+              </div>
+            </div>
+
+            <div class="Chat signChart" id="signChart"></div>
+          </div>
+          <div class="ChatBox minChartBox" :class="{ hiddenChart: signActive != 2 }">
+
+            <div class="Chat stepChart" id="stepChart"></div>
+            <div class="result">
+              <div class="wrapBox">
+                <div class="text">
+                  <div class="left">
+                    <p>总步数：{{ stepsData.stepTotal.total || '--' }}</p>
+                  </div>
+                  <div class="right">
+                    <img :src="stepsData.stepTotal.compare > 0 ? upImg : downImg" alt="" />
+                    <span>{{ Math.abs(stepsData.stepTotal.compare) || '--' }}</span>
+                  </div>
+                </div>
+                <div class="text">
+                  <div class="left">
+                    <p>平均步数：{{ stepsData.stepAvg.avg || '--' }}</p>
+                  </div>
+                  <div class="right">
+                    <img :src="stepsData.stepAvg.compare > 0 ? upImg : downImg" alt="" />
+                    <span>{{ Math.abs(stepsData.stepAvg.compare) || '--' }}</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="advice" v-show="signActive == 2">
+            <div class="content">
+              <p class="title">健康建议</p>
+              <p>{{ advice || '--' }}</p>
+            </div>
+          </div>
+          <div class="title-out" v-show="signActive == 2">
+            <span>热量消耗</span>
+          </div>
+          <div class="ChatBox minChartBox" :class="{ hiddenChart: signActive != 2 }">
+            <div class="Chat calorieChart" id="calorieChart"></div>
+            <div class="result">
+              <div class="wrapBox">
+                <div class="text">
+                  <div class="left">
+                    <p>总消耗：{{ calorieData.calorieTotal.total || '--' }}</p>
+                  </div>
+                  <div class="right">
+                    <img :src="calorieData.calorieTotal.compare > 0 ? upImg : downImg" alt="" />
+                    <span>{{ Math.abs(calorieData.calorieTotal.compare) || '--' }}</span>
+                  </div>
+                </div>
+                <div class="text">
+                  <div class="left">
+                    <p>平均消耗：{{ calorieData.calorieAvg.avg || '--' }}</p>
+                  </div>
+                  <div class="right">
+                    <img :src="calorieData.calorieAvg.compare > 0 ? upImg : downImg" alt="" />
+                    <span>{{ Math.abs(calorieData.calorieAvg.compare) || '--' }}</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="advice" v-show="signActive == 2">
+            <div class="content">
+              <p class="title">健康建议</p>
+              <p>{{ adviceOfCalor || '--' }}</p>
+            </div>
           </div>
         </div>
-        <div class="result">
-          <div class="result-con">
+        <!-- 建议 -->
+        <!-- <div class="advice" v-show="signActive !== 2">
+          <div class="content">
+            <p class="title">健康建议</p>
+            <p>{{ advice || '--' }}</p>
+          </div>
+        </div> -->
+        <div class="overview" v-show="signActive !== 2">
+          <div class="content">
             <div class="title">
               <span class="title-text">{{ surveyTitle }}</span>
-              <div class="mood-list" v-if="emotionList.length > 0">
-                <div class="item" v-for="(item, index) in emotionList" :key="index"
+              <div class="mood-list">
+                <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>
+                    <img :src="calcWeekImg(item.days, item.lastDay)" alt="" />
+                    <span class="day-text status">{{ calcWeekImg(item.days, item.lastDay, true) }}</span>
                   </p>
-
                   <p>{{ item.text }}</p>
                 </div>
               </div>
-              <div class="mood-list-no-data" v-else>
-                <div class="no-data">
-                  <img :src="noDataImg" alt />
-                  <p>暂无数据</p>
-                </div>
-              </div>
+              <!-- <div class="mood-list-no-data" v-else>
+                            <div class="no-data">
+                                <img src="../../../../assets/img/no_data_01.png" alt />
+                                <p>暂无数据</p>
+                            </div>
+                        </div>-->
             </div>
           </div>
         </div>
@@ -109,11 +205,11 @@
 <script>
 import NavBar from '@/components/NavBar';
 import { Signsmodel } from '@/config/models';
-import EchartBox from '@/components/EchartBox';
-import { getMonthsByYear, getWeeksByYear } from '@/services/utils-service';
+import { getMonthsByYear, getWeeksByYear, isNotNull } from '@/services/utils-service';
+import APIHealthUser from '@/api/health-user';
 export default {
   components: {
-    NavBar, EchartBox
+    NavBar,
   },
   data() {
     return {
@@ -124,36 +220,50 @@ export default {
       weekList: [],
       maxCount: '',
       currentRecord: {},
-      psyCurrent: 0,
+      signActive: 0,
+      upImg: require('@/assets/today/icons/up.png'),
+      downImg: require('@/assets/today/icons/down.png'),
+      signList: [
+        {
+          grid: 'heartRateList',
+          name: '心率',
+          label: 'heartrate'
+        },
+        {
+          grid: 'temperatureList',
+          name: '体温',
+          label: 'temperature'
+        },
+        {
+          grid: null,
+          name: '运动',
+          label: 'step'
+        }
+      ],
       psyList: [
         { name: 'heartrate', text: '心率', value: 0 },
         { name: 'temperature', text: '体温', value: 1 },
-        { name: 'step', text: '步数', value: 2 }
+        { name: 'step', text: '运动', value: 2 }
       ],
       healthyType: '',
       emoName: '',
       currentEmoName: '',
       pieRightList: [
         {
-          text: "无情绪倾向",
-          count: 12,
-          percentage: "80",
-          color: "#179b3b"
-        },
-        {
-          text: "轻度情绪倾向",
-          count: 2,
+          text: "心率偏低",
+          count: 1,
           percentage: "80",
-          color: "#8dc21f"
+          color: "#2ea7e0"
         },
         {
-          text: "中度情绪倾向",
-          count: 1,
+          text: "心率正常",
+          count: 12,
           percentage: "80",
-          color: "#2ea7e0"
+          color: "#179b3b"
         },
+
         {
-          text: "重度情绪倾向",
+          text: "心率偏高",
           count: 1,
           percentage: "80",
           color: "#ff5f8b"
@@ -162,16 +272,50 @@ export default {
       pieEcharts: null,
       pieData: [], //饼状图数据
       statisticsList: [
-        { label: '最大值', value: '75', time: '08:15', bgColor: '#ff5f8b' },
+        /* { label: '最大值', value: '75', time: '08:15', bgColor: '#ff5f8b' },
         { label: '最小值', value: '40', time: '10:15', bgColor: '#189b3b' },
-        { label: '最近值', value: '50', time: '18:15', bgColor: '#2ea7e0' }
+        { label: '最近值', value: '50', time: '18:15', bgColor: '#2ea7e0' } */
       ],
       emotionList: [
-        { days: "5", text: "无情绪倾向", color: "#179b3b" },
-        { days: "4", text: "轻度情绪倾向", color: "#8dc21f" },
-        { days: "3", text: "中度情绪倾向", color: "#2ea7e0" },
-        { days: "2", text: "重度情绪倾向", color: "#ff5f8b" }
+        /* { days: "4", text: "心率偏低", color: "#2ea7e0" },
+        { days: "5", text: "心率正常", color: "#179b3b" },
+
+
+        { days: "2", text: "心率偏高", color: "#ff5f8b" } */
       ],
+      noDataImg: require('@/assets/today/images/no_data_01.png'),
+      stepsData: {
+        stepTotal: {
+          compare: '',
+          lastTotal: '',
+          total: ''
+        },
+        stepAvg: {
+          compare: '',
+          lastAvg: '',
+          avg: ''
+        }
+      },
+      calorieData: {
+        calorieTotal: {
+          compare: '',
+          lastTotal: '',
+          total: ''
+        },
+        calorieAvg: {
+          compare: '',
+          lastAvg: '',
+          avg: ''
+        }
+      },
+
+      signChart: null,
+      stepChart: null,
+      calorieChart: null,
+      advice: '',
+      adviceOfCalor: '',
+      signData: '',
+      chartSeries: []
     }
   },
   computed: {
@@ -254,6 +398,19 @@ export default {
         };
       }
     },
+    signsChartTitle() {
+      return this.signActive != 2 ? `${this.emoName}数据图` : '运动步数'
+    },
+    signGrid() {
+      let list = [];
+      if (this.signList[this.signActive].grid) {
+        let temp = this[`${this.signList[this.signActive].grid}`];
+        if (temp) {
+          list = temp;
+        }
+      }
+      return list;
+    },
     // 默认折线图配置，echarts 具体配置 见 https://echarts.apache.org/zh/option.html#title
     defaultOptions() {
       return {
@@ -395,27 +552,523 @@ export default {
     }
 
   },
+  watch: {
+    pieData: {
+      handler() {
+        this.$nextTick(() => {
+          this.initPieEchart();
+        });
+      },
+      deep: true
+    },
+    signActive: {
+      handler(val) {
+        console.log(val);
+        this.$nextTick(() => {
+          this.initData();
+        });
+      },
+      deep: true
+    }
+  },
   created() {
     this.loadParams();
-    this.initEchartText();
   },
   mounted() {
     this.$nextTick(() => {
       if (this.params.dateType == 1) {
         this.getMonths();
       } else {
-        this.getWeeks()
+        this.getWeeks();
       }
-
+      this.initData();
     })
+
   },
   methods: {
+    initData() {
+      //初始化图表
+      if (!this.signChart) {
+        this.signChart = this.$echarts.init(document.getElementById('signChart'));
+      }
+      if (!this.stepChart) {
+        this.stepChart = this.$echarts.init(document.getElementById('stepChart'));
+      }
+      if (!this.calorieChart) {
+        this.calorieChart = this.$echarts.init(document.getElementById('calorieChart'));
+      }
+      //渲染图表
+      this.initSignChart();
+      console.log("初始化图表");
+    },
+    async initSignChart() {
+      let option = this.getOption();
+      console.log("option111", option);
+      let data = await this.getReportData('', this.date.start, this.date.end);
+      /* this.signData = data; */
+      this.advice = data.advice;
+      if (this.signActive == 0) {
+        //测试
+        this.formateHeartRateData(option, data.days);
+        this.signChart.setOption(option);
+        console.log('心率');
+      } else if (this.signActive == 1) {
+        //测试
+        this.formateTemperatureData(option, data.days);
+        this.signChart.setOption(option);
+        console.log('体温');
+      } else if (this.signActive == 2) {
+        option = this.getOption(false);
+        let option2 = this.getOption(false);
+        let data2 = await this.getReportData(3, this.date.start, this.date.end);
+        if (data.stepAvg || data2.calorieAvg) {
+          this.stepsData = { ...data };
+          this.calorieData = { ...data2 };
+          this.adviceOfCalor = data2.advice || '--';
+        }
+        this.formateStepData(option, data.days);
+        this.formateCalorieData(option2, data2.days);
+
+        this.stepChart.setOption(option);
+        this.calorieChart.setOption(option2);
+        console.log("this.calorieChart", option, "this.stepChart", option2);
+        console.log('步数');
+      }
+    },
+    formateHeartRateData(option, data) {
+      let xdata = [];
+      let ydata = [];
+      let fill = [];
+      let max = 0;
+      data.forEach(item => {
+        if (item.value > max) {
+          max = item.value || '--';
+        }
+      });
+      data.forEach(item => {
+        xdata.push(item.key);
+
+        ydata.push({
+          value: item.value || '--',
+          label: {
+            show: false
+          },
+          itemStyle: {
+            borderWidth: 3,
+            borderColor: this.calcColorByEvaluate(item.evaluate)
+          }
+        });
+      });
+      fill = data.map((item, index) => {
+        return {
+          value: [index, item.valueMin || '--', item.valueMax || '--']
+        };
+      })
+      option.xAxis.data = xdata;
+      option.series[0].data = ydata;
+      option.series[1].data = fill;
+      option[0] =
+        option.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]
+            );
+          }
+        };
+      /* option.series[1].data = fill; */
+      // 规定最小值
+      option.yAxis.min = 40;
+      // 规定最大值
+      option.yAxis.max = 150;
+      //设置高压标线
+      option.series[0].markLine = {
+        data: [
+          {
+            symbol: 'pin',
+            silent: true,
+            yAxis: 120,
+            lineStyle: {
+              color: '#C1272D'
+            },
+            label: {
+              color: '#C1272D'
+            }
+          }
+        ]
+      };
+    },
+    formateHeartRateColor(value) {
+      if (value > 120) {
+        return this.heartRateMap.get('偏高');
+      } else if (value >= 60) {
+        return this.heartRateMap.get('正常');
+      } else {
+        return this.heartRateMap.get('偏低');
+      }
+    },
+    formateTemperatureData(option, data) {
+      let xdata = [];
+      let ydata = [];
+      let fill = [];
+      let max = 0;
+      data.forEach(item => {
+        if (item.value > max) {
+          max = item.value || '--';
+        }
+      });
+      data.forEach(item => {
+        xdata.push(item.key);
+        /* fill.push({
+          value: max - item.value || '--',
+          label: {
+            show: false
+          },
+          itemStyle: {
+            borderWidth: 3,
+            borderColor: this.calcColorByEvaluate(item.evaluate)
+          }
+        }); */
+        ydata.push({
+          value: item.value || '--',
+          label: {
+            show: false
+          },
+          itemStyle: {
+            borderWidth: 3,
+            borderColor: this.calcColorByEvaluate(item.evaluate)
+          }
+        });
+      });
+      fill = data.map((item, index) => {
+        return {
+          value: [index, item.valueMin || '--', item.valueMax || '--']
+        };
+      })
+      option.xAxis.data = xdata;
+      option.series[0].data = ydata;
+      option.series[1].data = fill;
+      option.series[0].markLine = {
+        data: [
+          {
+            type: "average",
+            name: "体温",
+            yAxis: 37.2,
+            label: {
+              fontSize: 14,
+              position: "end",
+            },
+            lineStyle: {
+              type: "dashed",
+              width: 2,
+              color: "red",
+            },
+          },
+        ],
+      }
+      option[0] =
+        option.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]
+            );
+          }
+        };
+      /* option.series[1].data = fill; */
+      // 规定最小值
+      option.yAxis.min = 34.5;
+      // 规定最大值
+      option.yAxis.max = 42.5;
+    },
+    formateTemperatureColor(value) {
+      if (value > 38) {
+        return this.temperatureMap.get('发烧');
+      } else {
+        return this.temperatureMap.get('正常');
+      }
+    },
+    formateStepData(option, data) {
+      let xdata = [];
+      let ydata = [];
+      data.forEach(item => {
+        xdata.push(item.key);
+        ydata.push({
+          value: item.value || '--',
+          label: {
+            show: true
+          },
+          itemStyle: {
+            borderWidth: 3,
+            borderColor: this.calcColorByEvaluate(item.evaluate)
+          }
+        });
+      });
+      option.xAxis.data = xdata;
+      option.series[0].data = ydata;
+      // 隐藏y轴
+      option.yAxis.show = false;
+    },
+    formateCalorieData(option, data) {
+      let xdata = [];
+      let ydata = [];
+      data.forEach(item => {
+        xdata.push(item.key);
+        ydata.push({
+          value: item.value == null ? 0 : item.value || '--',
+          label: {
+            show: true
+          },
+          itemStyle: {
+            borderWidth: 3,
+            borderColor: this.calcColorByEvaluate(item.evaluate)
+          }
+        });
+      });
+      option.xAxis.data = xdata;
+      option.series[0].data = ydata;
+      // 隐藏y轴
+      option.yAxis.show = false;
+    },
+    getOption(/* point = true */) {
+      let that = this;
+      this.chartSeries = [];
+      if (this.signActive == 0 || this.signActive == 1) {
+        this.chartSeries = [
+          {
+            name: '平均值',
+            type: 'scatter',
+            symbolSize: 14,
+          },
+          {
+            name: '',
+            type: 'custom',
+            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 = [20];
+              }
+              return (
+                rectShape && {
+                  type: 'rect',
+                  shape: rectShape,
+                  style: api.style()
+                }
+              );
+            },
+            itemStyle: {
+              opacity: 0.8
+            },
+            encode: {
+              y: [1, 2],
+              x: 0
+            }
+          },
+        ]
+      } else {
+        this.chartSeries = [
+          {
+            type: 'line',
+            padding: 10,
+            smooth: true,
+            symbol: 'circle',
+            symbolSize: 10,
+            itemStyle: {
+              color: '#fff',
+              borderWidth: 4
+            },
+            lineStyle: {
+              width: 6,
+              type: 'solid',
+              color: '#189b3b'
+            }
+          },
+        ]
+      }
+      let option = {
+        grid: {
+          show: true,
+          borderWidth: 0,
+          top: '10%',
+          left: '15%',
+          right: '10%',
+          bottom: '20%'
+        },
+        xAxis: {
+          type: 'category',
+          axisLine: {
+            show: false
+          },
+          axisTick: {
+            show: false
+          },
+          splitLine: {
+            show: false,
+            lineStyle: {
+              color: '#ddd',
+              width: 4
+            }
+          },
+          axisLabel: {
+            show: true,
+            fontSize: 12,
+            showMinLabel: true, //显示最小值
+            showMaxLabel: true, //显示最大值
+            marginBottom: 10 // 调整标签与轴线的距离
+          }
+        },
+        yAxis: {
+          type: 'value',
+          boundaryGap: ['5%', '5%'],
+          nameTextStyle: {
+            fontSize: 13
+          },
+          alignTicks: false,
+          axisTick: {
+            show: false
+          },
+          axisLabel: {
+            show: true,
+            fontSize: 13
+          },
+          splitLine: {
+            show: false,
+            lineStyle: {
+              color: '#ddd',
+              width: 1
+            }
+          }
+        },
+        dataZoom: [
+          {
+            start: 0,
+            end: 100,
+            textStyle: {
+              color: '#FFF',
+              fontSize: 14
+            },
+            show: true,
+            height: 20,
+            bottom: 8,
+            handleStyle: {
+              borderWidth: 4,
+              borderCap: 'square'
+            }
+          }
+        ],
+        tooltip: {
+          trigger: 'axis',
+          textStyle: {
+            fontSize: 16,
+            align: 'center'
+          },
+          formatter: function (params) {
+            return params[0].marker + params[0].name + '</br>' + params[0].value;
+          }
+        },
+        series: this.chartSeries
+      };
+      /* if (!point) {
+        option.series = [
+          {
+            type: 'bar',
+            barMaxWidth: 15,
+            label: {
+              show: true,
+              color: '#000',
+              position: 'outside'
+            },
+            itemStyle: {
+              borderRadius: 12
+            }
+          }
+        ];
+      } */
+      return option;
+    },
+    calcColorByEvaluate(value) {
+      let color = '';
+      const intValue = Number(value);
+      switch (intValue) {
+        case 1:
+          // 偏高
+          color = '#ff5f8b';
+          break;
+        case 2:
+          // 正常
+          color = '#189b3b';
+          break;
+        case 3:
+          // 偏低
+          color = '#2ea7e0';
+          break;
+        default:
+          color = '#189b3b';
+          break;
+      }
+      return color;
+    },
     loadParams() {
       let params = this.$route.query;
       if (params) {
         this.params = params;
         this.emoName = Signsmodel[params.name].name;
-        this.psyCurrent = this.calcPsyTabindex(Signsmodel[params.name].type);
+        this.signActive = this.calcPsyTabindex(Signsmodel[params.name].type);
         this.currentEmoName = params.name;
       }
     },
@@ -470,13 +1123,15 @@ export default {
           return item.count === this.count;
         })[0];
         // 注意，周/月切换，日期不同
-        let date = this.weekList.filter(item => {
+        this.date = this.weekList.filter(item => {
           return item.count === this.count;
-        })[0].name;
+        })[0]
+
         if (this.count <= 0) {
           this.isAddClick = false;
         }
-        console.log("当前切换的日期", date);
+        this.initData();
+        console.log("当前切换的日期", this.date);
       } else {
         // 上一个
         if (this.count >= this.maxCount) {
@@ -486,21 +1141,22 @@ export default {
         this.isAddClick = true;
         // 当前切换的日期
         // 注意，周/月切换，日期不同
-        let date = this.weekList.filter(item => {
+        this.date = this.weekList.filter(item => {
           return item.count === this.count;
-        })[0].name;
+        })[0];
         this.currentRecord = this.weekList.filter(item => {
           return item.count === this.count;
         })[0]
-        console.log("当前切换的日期", date);
+        console.log("当前切换的日期", this.date);
         if (this.count >= this.maxCount) {
           this.isPreClick = false;
-        }
+        };
+        this.initData();
       }
     },
     onPsyTabClick(item) {
       this.healthyType = item.value;
-      this.psyCurrent = this.calcPsyTabindex(Signsmodel[item.name].type);
+      this.signActive = this.calcPsyTabindex(Signsmodel[item.name].type);
       this.emoName = Signsmodel[item.name].name;
       this.currentEmoName = item.name;
     },
@@ -535,7 +1191,9 @@ export default {
         .map((item, index) => {
           return {
             name: item.curYear + '-' + item.curMonth,
-            count: index
+            count: index,
+            start: item.start,
+            end: item.end
           };
         })
       this.currentRecord = this.weekList.filter(item => {
@@ -545,6 +1203,11 @@ export default {
       this.maxCount = months.length - 1;
       this.isAddClick = this.maxCount - this.count < this.maxCount;
       this.isPreClick = this.maxCount - this.count > 0;
+      this.date = {
+        start: months[0].start,
+        end: months[0].end
+      }
+      //this.getReportData('', months[0].start, months[0].end,);
     },
     getWeeks() {
       const weeks = getWeeksByYear(1);
@@ -554,7 +1217,9 @@ export default {
           return {
 
             name: item.start + '-' + item.end,
-            count: index
+            count: index,
+            start: item.start,
+            end: item.end
           };
         })
       this.currentRecord = this.weekList.filter(item => {
@@ -564,15 +1229,237 @@ export default {
       this.maxCount = weeks.length - 1;
       this.isAddClick = this.maxCount - this.count < this.maxCount;
       this.isPreClick = this.maxCount - this.count > 0;
-    }
+      this.date = {
+        start: weeks[0].start,
+        end: weeks[0].end
+      }
+      //this.getReportData('', weeks[0].start, weeks[0].end,);
+    },
+    // 获取体征历史数据
+    getReportData(value, startDate, endDate) {
+      let reqDate = this.date;
+      let reqBody = {
+        personId: this.$store.getters.personId,
+        dateType: 1,
+        healthyType: value || this.signActive,
+        startTime: startDate || reqDate.start,
+        endTime: endDate || reqDate.end
+      };
+      return new Promise(resolve => {
+        APIHealthUser.getReportData(reqBody).then(res => {
+          console.log("情绪数据", res.data);
+          if (res.data.data.days) {
+            res.data.data.days = res.data.data.days.map(item => {
+              item.key = this.$dayjs(item.key).format('MM-DD');
+              return item;
+            });
+          }
+          this.pieRightList = [];
+          this.statisticsList = [];
+          this.emotionList = [];
+          this.emotionData = [];
+          this.xAxisData = [];
+          const re = res.data;
+          const data = re.data;
+          if (re.stateCode === 1) {
+            // 有数据
+            if (this.signActive == 2) {
+              resolve(data);
+              console.log("步数数据", data);
+              return
+            }
+
+            // 填充饼状图
+            let None = {
+              count: data.normalTimes.normalTimes,
+              percentage: data.normalTimes.normalPercent,
+              text: `${this.emoName}正常`,
+              color: '#179b3b',
+              lastPercentage: data.normalTimes.lastNormalPercent,
+              compare: data.normalTimes.compare
+            };
+            let Moderate = {
+              count: data.lowTimes.lowTimes,
+              percentage: data.lowTimes.lastLowPercent,
+              text: `${this.emoName}偏低`,
+              color: '#2ea7e0',
+              lastPercentage: data.lowTimes.lastNormalPercent,
+              compare: data.lowTimes.compare
+            };
+            let Severe = {
+              count: data.highTimes.highTimes,
+              percentage: data.highTimes.highPercent,
+              text: `${this.emoName}偏高`,
+              color: '#ff5f8b',
+              lastPercentage: data.highTimes.lastNormalPercent,
+              compare: data.highTimes.compare
+            };
+            if (this.healthyType !== 1) {
+              this.pieRightList.push(None);
+              this.pieRightList.push(Moderate);
+              this.pieRightList.push(Severe);
+            } else {
+              this.pieRightList.push(None);
+              this.pieRightList.push(Severe);
+            }
+            this.pieData = this.pieRightList.map(item => {
+              return {
+                value: item.count,
+                itemStyle: {
+                  color: item.color
+                }
+              };
+            });
+
+            // 中间正方形图
+            let Max = {
+              label: '最大值',
+              value: Number(data.max.value) || '--',
+              time: data.max.date
+                ? this.$dayjs(data.max.date).format('MM/DD HH:mm')
+                : '',
+              bgColor: this.calcResultColor(1)
+            };
+            let Min = {
+              label: '最小值',
+              value: Number(data.min.value) || '--',
+              time: data.min.value
+                ? this.$dayjs(data.min.date).format('MM/DD HH:mm')
+                : '',
+              bgColor: this.calcResultColor(1)
+            };
+            let Avg = {
+              label: '平均值',
+              value: Number(data.avg.value) || '--',
+              time: data.avg.date
+                ? this.$dayjs(data.avg.date).format('MM/DD HH:mm')
+                : '',
+              bgColor: this.calcResultColor(1)
+            };
+            this.statisticsList.push(Max);
+            this.statisticsList.push(Min);
+            this.statisticsList.push(Avg);
+
+            // 周报月报底部显示数据
+
+            let NoneDay = {
+              days: data.normalDay.normalDay,
+              text: `${this.emoName}正常`,
+              color: '#179b3b',
+              lastDay: data.normalDay.lastNormalDay,
+            };
+            let ModerateDay = {
+              days: data.lowDay.lowDay,
+              text: `${this.emoName}偏低`,
+              color: '#2ea7e0',
+              lastDay: data.lowDay.lastLowDay,
+            };
+            let SevereDay = {
+              days: data.highDay.highDay,
+              text: `${this.emoName}偏高`,
+              color: '#ff5f8b',
+              lastDay: data.highDay.lastHighDay,
+            };
+            // 体温不显示偏低
+            if (this.healthyType !== 1) {
+              this.emotionList.push(NoneDay);
+              this.emotionList.push(ModerateDay);
+              this.emotionList.push(SevereDay);
+            } else {
+              this.emotionList.push(NoneDay);
+              this.emotionList.push(SevereDay);
+            }
+            resolve(data)
+
+            // 
+            /* resolve(data) */
+            /* if (!data.days) {
+              return;
+            } */
+          } else {
+            // 置空
+          }
+
+        });
+      })
+
+    },
+    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;
+    },
+    // 计算显示是上升or下降的图片
+    /**
+     *
+     * @param { 本周情绪比例} current
+     * @param { 上周情绪比例 } last
+     * @param { 是否返回对比比例 } isCallBackCompare
+     */
+    calcImg(current, last, isCallBackCompare) {
+      let imgUrl = '';
+      let compare = '';
+      if (isNotNull(current) && isNotNull(last)) {
+        compare = Number(current) - Number(last);
+        imgUrl = compare > 0 ? this.upImg : compare == 0 ? '' : this.downImg;
+      }
+      if (isCallBackCompare) {
+        console.log("compare", compare);
+        return compare;
+      } else {
+        return imgUrl;
+      }
+    },
+    calcWeekImg(cur, last, callBackText) {
+      let imgurl = '';
+      let text = '';
+      if (isNotNull(cur) && isNotNull(last)) {
+        let curNumber = Number(cur);
+        let latNumber = Number(last);
+        if (curNumber - latNumber == 0) {
+          text = '持平';
+        } else {
+          imgurl = curNumber < latNumber ? this.downImg : this.upImg;
+          text = Math.abs(curNumber - latNumber) + '天';
+        }
+        if (callBackText) {
+          return text;
+        } else {
+          return imgurl;
+        }
+      }
+    },
   },
 }
 </script>
 
 <style scoped lang="scss">
+@import './include.scss';
+
 .report {
   height: 100vh;
-  width: 100%;
   overflow: hidden;
   background-color: #f5f5f5;
   font-family: Source Han Sans CN;
@@ -581,9 +1468,8 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    padding: 20px 40px;
+    /*  padding: 20px 40px; */
     padding-bottom: 10px;
-    padding-top: 100px;
     left: 0;
 
     .timearea {
@@ -601,7 +1487,7 @@ export default {
     height: 60px;
     position: relative;
     margin: 20px 0 0 0;
-    padding: 0 20px;
+    /*  padding: 0 20px; */
 
     .psy-tab-con {
       background-color: #eeeeee;
@@ -644,7 +1530,8 @@ export default {
     height: calc(100vh - 150px);
     overflow: scroll;
     background-color: #fff;
-    padding: 0 20px;
+    padding-bottom: 150px;
+    /* padding: 0 20px; */
 
     .pie-chart-con {
       flex: 1;
@@ -656,8 +1543,8 @@ export default {
       .pie-chart-left {
         position: relative;
         height: 300px;
-        padding-left: 30px;
-        width: 35%;
+        /* padding-left: 30px; */
+        width: 30%;
         @include center();
 
         #pieChart {
@@ -668,7 +1555,7 @@ export default {
 
       .pie-chart-right {
         height: 300px;
-        width: 65%;
+        width: 70%;
         padding-right: 40px;
         @include center();
 
@@ -710,6 +1597,18 @@ export default {
               justify-content: center;
               align-items: center;
             }
+
+            .status {
+              padding: 0 10px;
+              @include center();
+
+              img {
+                height: 30px;
+                width: 30px;
+                padding: 0 6px;
+                object-fit: contain;
+              }
+            }
           }
         }
       }
@@ -753,171 +1652,300 @@ export default {
     }
 
     .bottom {
-      flex: 1;
-      overflow: scroll;
+
 
       .echart-container {
+        flex: 1;
         position: relative;
         min-height: 600px;
         background-color: #fff;
         padding: 0 10px;
 
-        .echart {
-          height: 200px;
-          padding: 0 10px;
+        .title-out {
+          font-size: 36px;
+          font-weight: bold;
+          padding: 60px 20px 20px 20px;
         }
-      }
-
-      .result {
-        padding-bottom: 40px;
 
-        .result-con {
-          height: 100%;
-          background-color: #fff;
-          border-radius: 40px;
+        .ChatBox {
           overflow: hidden;
+          height: 650px;
+
+          border: 2px solid #cdf348;
+          border-radius: 30px;
+          margin-top: 30px;
 
-          &.reminder {
-            padding: 0 32px 40px 32px;
+          h4 {
+            padding: 40px 0 10px 60px;
           }
 
-          .title {
+          .legendBox {
+            width: 100%;
+            height: 100px;
             display: flex;
-            justify-content: flex-start;
-            align-items: flex-start;
-            flex-direction: column;
-            margin-bottom: 60px;
+            justify-content: flex-end;
+            align-items: center;
+            padding: 0 30px;
 
-            span {
-              font-size: 36px;
-              font-weight: bold;
-            }
+            .legend {
+              display: flex;
+              flex-wrap: wrap;
+              justify-content: flex-end;
+              align-items: center;
+              font-size: 20px;
 
-            .font-28 {
-              font-weight: 400;
-              font-size: 24px;
-              color: #8b8b8b;
-              text-align: left;
-            }
+              .legendItem {
+                position: relative;
+                width: 205px;
+                margin-top: 10px;
+                margin-right: 20px;
 
-            .title-no-data {
-              padding: 68px 0 26px 30px;
-            }
+                &:nth-child(2n) {
+                  margin-right: 0;
+                }
+              }
 
-            p {
-              font-size: 24px;
-              color: $green;
-            }
+              .not {
+                .number {
+                  color: #179b3b;
+                }
 
-            .title-emo {
-              font-size: 48px;
-              padding: 28px 0 42px 0;
-              text-align: left;
-            }
+                &::before {
+                  content: '';
+                  position: absolute;
+                  top: 0;
+                  bottom: 0;
+                  left: -20px;
+                  width: 15px;
+                  height: 15px;
+                  background: #179b3b;
+                  border-radius: 50%;
+                  margin: auto;
+                }
+              }
 
-            .no-data {
-              height: 500px;
-              width: 100%;
-              @include center();
-              flex-direction: column;
+              .mild {
+                .number {
+                  color: #2ea7e0;
+                }
 
-              img {
-                height: 220px;
-                width: 350px;
+                &::before {
+                  content: '';
+                  position: absolute;
+                  top: 0;
+                  bottom: 0;
+                  left: -20px;
+                  width: 15px;
+                  height: 15px;
+                  background: #2ea7e0;
+                  border-radius: 50%;
+                  margin: auto;
+                }
               }
 
-              p {
-                color: #999;
-                font-size: 24px;
-                padding: 40px 0 130px 0;
+              .moderate {
+                .number {
+                  color: #8dc21f;
+                }
+
+                &::before {
+                  content: '';
+                  position: absolute;
+                  top: 0;
+                  bottom: 0;
+                  left: -20px;
+                  width: 15px;
+                  height: 15px;
+                  background: #8dc21f;
+                  border-radius: 50%;
+                  margin: auto;
+                }
+              }
+
+              .severe {
+                .number {
+                  color: #ff5f8b;
+                }
+
+                &::before {
+                  content: '';
+                  position: absolute;
+                  top: 0;
+                  bottom: 0;
+                  left: -20px;
+                  width: 15px;
+                  height: 15px;
+                  background: #ff5f8b;
+                  border-radius: 50%;
+                  margin: auto;
+                }
               }
             }
           }
 
-          .title-text {
-            padding: 68px 0 26px 30px;
+          .minLegendBox {
+            width: 100%;
+
+            .legend {
+              .legendItem {
+                width: auto;
+                margin-right: 50px;
+
+                &:nth-child(2n) {
+                  margin-right: 50px;
+                }
+
+                &:last-child {
+                  margin-right: 0;
+                }
+              }
+            }
           }
 
-          .title-reminder {
-            padding: 68px 0 0 0;
+          .Chat {
+            width: calc(100vw - 80px);
+            height: 500px;
           }
 
-          .friendly-reminder,
-          .warm-reminder {
+          .result {
+            height: 140px;
+            padding: 0 30px;
+            border-radius: 70px;
             display: flex;
-            justify-content: flex-start;
+            justify-content: center;
             align-items: flex-start;
             flex-direction: column;
-            margin-bottom: 20px;
-            background-color: #f2f2f2;
-            padding: 40px 38px 38px 28px;
 
-            p {
-              font-weight: bold;
-              text-align: left;
-              padding-bottom: 22px;
-              font-size: 30px;
+            .wrapBox {
+              padding: 10px 120px 10px 60px;
+              width: 100%;
+              background-color: #e6e6e6;
+              border-radius: 30px;
             }
 
-            span {
-              text-align: left;
-              font-size: 24px;
+            .text {
+              display: flex;
+              justify-content: flex-start;
+              align-items: center;
+
+              .right {
+
+                @include center();
+                padding-left: px2rem(20);
+
+                img {
+                  height: 30px;
+                  width: 30px;
+                  object-fit: contain;
+                  margin: 0 5px;
+                }
+              }
             }
           }
+        }
 
-          .mood-list {
-            display: grid;
-            grid-template-columns: repeat(2, auto); //定义了一个 2x2 的网格布
-            grid-template-rows: repeat(2, 1fr);
-            gap: 42px;
-            padding: 0 88px 40px 74px;
+        .minChartBox {
+          height: 760px;
+        }
 
-            .item {
-              width: 274px;
-              height: 220px;
-              @include center();
-              flex-direction: column;
-              border-radius: 40px;
+        .hiddenChart {
+          width: 0;
+          height: 0;
+        }
 
-              p {
-                font-size: 24px;
-                padding: 0;
-                color: #fff;
 
-                .day {
-                  padding: 10px;
-                  font-size: 56px;
-                }
+      }
 
-                .day-text {
-                  font-size: 24px;
-                }
-              }
-            }
+      .advice {
+        padding: 52px 20px 60px 20px;
+
+        .content {
+          background: #f2f6ff;
+          border-radius: 20px;
+          padding: 0px 10px;
+          text-align: left;
+
+          p {
+            font-size: 24px;
+            color: #707070;
+            line-height: 46px;
+            padding: 10px 0;
           }
 
-          .mood-list-no-data {
-            height: 500px;
-            width: 100%;
+          .title {
+            font-size: 36px;
+            font-weight: bold;
+            color: #2ea7e0;
+            line-height: 36px;
+          }
+        }
+      }
 
-            .no-data {
-              @include center();
-              flex-direction: column;
+      .overview {
+        padding: 0 30px 32px 30px;
 
-              img {
-                height: 220px;
-                width: 350px;
-              }
+        .content {
+          .title {
+            text-align: left;
 
-              p {
-                color: #999;
-                font-size: 24px;
-                padding: 40px 0 130px 0;
+            .title-text {
+              font-size: 36px;
+              font-weight: bold;
+              color: #282828;
+              line-height: 36px;
+            }
+
+            .mood-list {
+              display: grid;
+              grid-template-columns: repeat(2, 1fr); //定义了一个 2x2 的网格布
+              grid-template-rows: repeat(2, 1fr);
+              gap: 42px;
+              padding: 42px 42px 44px 40px;
+
+              .item {
+                /* width: 214px; */
+                height: 250px;
+                display: flex;
+                justify-content: center;
+                align-items: flex-start;
+                flex-direction: column;
+                padding-left: 60px;
+                color: #fff;
+                border: 1px solid #cdf348;
+                border-radius: 40px;
+
+                p {
+                  font-size: 28px;
+                  padding: 0;
+                  @include center();
+
+                  .day {
+                    /* padding: 5px; */
+                    font-size: 56px;
+                  }
+
+                  .day-text {
+                    font-size: 24px;
+                    padding: 0 10px;
+                  }
+
+                  img {
+                    height: 30px;
+                    width: 30px;
+                    object-fit: contain;
+                  }
+                }
               }
             }
           }
         }
       }
+
+
+
+
+
+
     }
   }
 
diff --git a/src/views/optimize/index.vue b/src/views/optimize/index.vue
index b140f1f..f6b6e31 100644
--- a/src/views/optimize/index.vue
+++ b/src/views/optimize/index.vue
@@ -4,7 +4,7 @@
     <!-- 专家介绍 -->
     <div class="expert-box">
       <van-swipe indicator-color="white">
-        <van-swipe-item v-for="(item, index) in expertImages" :key="index">
+        <van-swipe-item v-for="(item, index) in expertImages" :key="index" @click="onNavigation(item)">
           <img v-lazy="item.cover" />
         </van-swipe-item>
       </van-swipe>
@@ -189,6 +189,12 @@ export default {
         this.expertImages = data;
         console.log("this.expertImages", this.expertImages);
       })
+    },
+    onNavigation(item) {
+      console.log("轮播图", item);
+      if (item.href) {
+        window.location.href = item.href
+      }
     }
   }
 };
diff --git a/src/views/today/signsDetails.vue b/src/views/today/signsDetails.vue
index f7aa551..c2902f3 100644
--- a/src/views/today/signsDetails.vue
+++ b/src/views/today/signsDetails.vue
@@ -1,23 +1,13 @@
 <template>
   <div class="psychological-container">
-    <van-nav-bar
-      title="体征监测"
-      @click-left="onNavBack"
-      right-text="历史"
-      @click-right="onHistory"
-      left-text="返回"
-      left-arrow
-    >
+    <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"
-          >
+          <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" />
@@ -59,30 +49,13 @@
         </div>
         <!-- 日历 -->
 
-        <van-dialog
-          class="calenddar-dialog"
-          v-model="calendarDialogShow"
-          :show-confirm-button="false"
-          :show-cancle-button="false"
-          :close-on-click-overlay="true"
-          ref="calenddarDialog"
-        >
+        <van-dialog class="calenddar-dialog" v-model="calendarDialogShow" :show-confirm-button="false"
+          :show-cancle-button="false" :close-on-click-overlay="true" ref="calenddarDialog">
           <template #default>
             <div class="calendar" ref="calendarCon">
-              <van-calendar
-                v-model="calendarShow"
-                :min-date="minDate"
-                :max-date="maxDate"
-                :default-date="defaultDate"
-                :round="false"
-                :poppable="false"
-                color="#179b3b"
-                :show-confirm="false"
-                :show-title="false"
-                :show-subtitle="false"
-                :formatter="formatter"
-                @select="onSelect"
-              />
+              <van-calendar v-model="calendarShow" :min-date="minDate" :max-date="maxDate" :default-date="defaultDate"
+                :round="false" :poppable="false" color="#179b3b" :show-confirm="false" :show-title="false"
+                :show-subtitle="false" :formatter="formatter" @select="onSelect" />
             </div>
           </template>
         </van-dialog>
@@ -120,16 +93,9 @@
         <!-- 非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"
-            >
+            <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>
@@ -138,22 +104,15 @@
               </template>
             </van-circle>
 
-            <div
-              class="circle-white"
-              :style="{
-                borderColor: calcColorByTypeAndValue(this.healthyType, this.resultLevel, 2)
-              }"
-            ></div>
+            <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="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">
@@ -166,12 +125,8 @@
 
         <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="item" v-for="(item, index) in statisticsList" :key="index"
+              :style="{ backgroundColor: item.bgColor }">
               <div class="top">
                 <span>{{ item.label || '--' }}</span>
               </div>
@@ -189,8 +144,7 @@
         <div class="tip">
           <img class="img" src="@/assets/today/icons/2_25.png" />
           <p>
-            <span>温馨提示：</span
-            >检测数据仅供参考，<span>不可做医疗诊断和治疗依据</span>，在运动、工作等场景会影响健康检测。
+            <span>温馨提示：</span>检测数据仅供参考，<span>不可做医疗诊断和治疗依据</span>，在运动、工作等场景会影响健康检测。
           </p>
         </div>
       </div>
@@ -199,12 +153,8 @@
       <div class="psy-tab-bar">
         <div class="psy-tab-con">
           <div class="psy-tab-list">
-            <div
-              :class="['psy-tab-item', { active: psyCurrent === index, notClick: false }]"
-              @click="onPsyTabClick(item, index)"
-              v-for="(item, index) in psyList"
-              :key="index"
-            >
+            <div :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>
           </div>
@@ -215,15 +165,8 @@
       <div class="bottom">
         <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>
+            <EchartBox echartId="charts" :outTitle="emoLegend.outTitle" rightRowType="in-line-block" height="200"
+              width="200" :legend="emoLegend" :options="defaultOptions"></EchartBox>
           </div>
         </div>
 
@@ -250,9 +193,7 @@
                 {{ result }}
               </p>
 
-              <span class="font-28"
-                ><!-- 继续保持积极乐观，培养健康的生活习惯，预防消极事件对情绪带来的不良影响。 -->{{ advice }}</span
-              >
+              <span class="font-28"><!-- 继续保持积极乐观，培养健康的生活习惯，预防消极事件对情绪带来的不良影响。 -->{{ advice }}</span>
             </div>
 
             <!--  <div class="friendly-reminder" v-if="emoType === 2">
@@ -272,12 +213,8 @@
             <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 }"
-                >
+                <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>
@@ -303,7 +240,9 @@
     <van-popup v-model="isPopup">
       <div class="popup">
         <div class="item science-tips first" v-if="emoType === 2">
-          <div class="tips"><h5>小科普</h5></div>
+          <div class="tips">
+            <h5>小科普</h5>
+          </div>
           <p>
             抑郁症是一抑郁种心理疾病，严重时可发展为精神障碍。然而当我们体会到了痛苦、悲伤、和郁闷等负面情绪，并不意味着我们就是抑郁症。日常的短时的喜、怒、哀、乐，都是正常的情绪变化，然而长期的低落情绪、兴趣缺失等可能会让我们有抑郁的风险。
           </p>
@@ -321,8 +260,8 @@
     </van-popup>
   </div>
 </template>
-    
-    <script>
+
+<script>
 import { Signsmodel } from '@/config/models';
 import EchartBox from '@/components/EchartBox';
 import ToastService from '@/services/toast-service';
@@ -719,7 +658,7 @@ export default {
       } else {
         today =
           this.$dayjs(this.selectDate || this.defaultDate).format('YYYY-MM-DD') ===
-          this.$dayjs(new Date()).format('YYYY-MM-DD')
+            this.$dayjs(new Date()).format('YYYY-MM-DD')
             ? '今天'
             : '';
       }
@@ -733,7 +672,7 @@ export default {
       } else {
         today =
           this.$dayjs(this.selectDate || this.defaultDate).format('YYYY-MM-DD') ===
-          this.$dayjs(new Date()).format('YYYY-MM-DD')
+            this.$dayjs(new Date()).format('YYYY-MM-DD')
             ? '今天'
             : '';
       }
@@ -1030,23 +969,23 @@ export default {
           // 中间折线图
           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
-                  }
-                };
-              })
+              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 || '--']
-                };
-              })
+              return {
+                value: [index, item.valueMin || '--', item.valueMax || '--']
+              };
+            })
             : [];
           console.log('this.weekAndMonData', this.weekAndMonData);
           if (this.currentDays === 0) {
@@ -1255,7 +1194,7 @@ export default {
       this.currentDays = 0;
       this.getSignsData(selectDate);
     },
-    onClose() {},
+    onClose() { },
     // 点击日期选择
     onTabClick(value, index) {
       this.current = index;
@@ -1411,8 +1350,8 @@ export default {
   }
 };
 </script>
-    
-  <style lang="scss">
+
+<style lang="scss">
 .calendar {
   height: 800px;
 
@@ -1423,10 +1362,12 @@ export default {
     .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;
@@ -1472,7 +1413,6 @@ export default {
   }
 }
 </style>
-    <style scoped lang="scss">
+<style scoped lang="scss">
 @import './scss/emotion-details.scss';
-</style>
-    
\ No newline at end of file
+</style>
\ No newline at end of file