Merge branch 'develop' into test

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-06-29 14:22:17
+ * @LastEditTime: 2023-06-30 09:30:30
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -582,4 +582,19 @@ update
     - 增加 抑郁，压力和疲劳心情图标
 
 - 心理监测详情
-    - 修改 图表拐点圆大小
+    - 修改 图表拐点圆大小
+
+
+## v1.0.73
+`2023.6.30`
+update
+- 心理建模进度查询
+    - 修改 去完成按钮位置
+    - 增加 建模完成提示
+- 心理监测详情
+    - 修改 返回到汇总页面日期设置为今天
+    - 修改 重度颜色显示
+    - 修复 圆环图表的等级展示出现换行的问题
+    - 修复 选择历史监测数据后，界面还是显示：今天的问题
+    - 修复 轻度疲劳图标显示不正确的问题
+    - 取消 日历组件星期显示

src/config/models.js

@@ -5,7 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.72F'; //版本号
+export const VERSION_MODEL = '1.0.73F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',

src/views/health/psychological/index.scss

@@ -82,7 +82,7 @@ $newBlue: #638EE4;
                     position: relative;
                     height: 180px;
                     padding-left: 15px;
-                    width: 40%;
+                    width: 35%;
                     @include center();
                     #pieChart {
                         height: 106px;
@@ -91,7 +91,7 @@ $newBlue: #638EE4;
                 }
                 .pie-chart-right {
                     height: 180px;
-                    width: 55%;
+                    width: 65%;
                     padding-right: 20px;
                     @include center();
                     .list {

src/views/health/psychological/index.vue

@@ -290,8 +290,6 @@ export default {
             ),
             // 路由传过来的情绪参数
             emoName: null,
-            // 左边标题
-            titleLeft: null,
             // 默认折线图 Series 配置
             defaultSeries: null,
             // 非日报折线图 Series 配置
@@ -339,12 +337,12 @@ export default {
                 legend: {
                     width: "60%",
                     orient: "horizontal",
-                    left: 'right',
+                    right: 'right',
                     top: "3%",
                     bottom: "3%",
-                    itemHeight: 12,
-                    itemWidth: 12,
-                    itemGap: 14,
+                    itemHeight: 10,
+                    itemWidth: 10,
+                    itemGap: 10,
                     align: 'auto',
                     selectedMode: false,
                     data: [
@@ -372,7 +370,7 @@ export default {
                         {
                             name: `重度${this.emoName}倾向`,
                             itemStyle: {
-                                color: "#F86825",
+                                color: "#EB1D15",
                             },
                             icon: "rect",
                             textStyle: {
@@ -595,6 +593,16 @@ export default {
                     }
                 ]
             };
+        },
+        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}`;
         }
     },
     watch: {
@@ -816,7 +824,7 @@ export default {
                         let SevereDay = {
                             days: data.SevereDay,
                             text: `重度${this.emoName}倾向`,
-                            color: "#ACACAC"
+                            color: "#EB1D15"
                         };
                         this.emotionList.push(NoneDay);
                         this.emotionList.push(MildDay);
@@ -863,9 +871,10 @@ export default {
         },
         // 初始化图表的文字内容
         initEchartText() {
+            let text = this.emoName === 'depression' ? '趋势' : '';
+            let today = this.$dayjs(this.defaultDate).format("YYYY-MM-DD") === this.$dayjs(new Date()).format("YYYY-MM-DD") ? '今天' : '';
             this.result = `无${this.emoName}倾向`;
-            this.echartsTitle = `${this.emoName}数据图`;
-            this.titleLeft = `今天${this.emoName}倾向趋势`;
+            this.echartsTitle = `${today}${this.emoName}数据图`;
             this.defaultSeries = [
                 {
                     name: `无${this.emoName}倾向`,
@@ -1000,7 +1009,6 @@ export default {
         //   返回
         onNavBack() {
             this.params.name = '';
-            this.params.date = this.selectDate || this.params.date;
             this.$router.replace({
                 name: 'psychologicalMain',
                 query: {
@@ -1014,7 +1022,6 @@ export default {
             this.currentDays = value;
             let currentDate = new Date();
             let leftText = value === 0 ? '今天' : value === 7 ? '7天' : '30天';
-            this.titleLeft = `${leftText}${this.emoName}倾向趋势`;
             this.surveyTitle = value === 7 ? '本周概览' : '本月概览';
             if (value === 7) {
                 this.defaultOptions.xAxis.data = [
@@ -1152,24 +1159,25 @@ export default {
     overflow: scroll;
 }
 .calendar {
-   /*  height: 300px; */
     overflow: scroll;
     .van-calendar {
         height: 350px;
+        .van-calendar__header {
+            display: none;
+        }
         .van-calendar__days .van-calendar__day {
             width: 27px;
             height: 27px;
+            margin: 5px;
             font-size: 12px;
             &.custom-calendar {
                 width: 27px;
                 height: 27px;
-                margin: 5px;
             }
             &.highlight-border {
                 border: 1px solid #62bd48;
                 width: 27px;
                 height: 27px;
-                margin: 5px;
                 border-radius: 50%;
             }
         }
@@ -1177,6 +1185,7 @@ export default {
             width: 27px;
             height: 27px;
             border-radius: 50%;
+            font-size: 12px;
         }
     }
 }

src/views/psychological-modeling/index.vue

@@ -56,18 +56,25 @@
 				<div class="sub_title">
 					完成一次“情绪初始化评估”，有助于建立您的个人情绪模型。
 				</div>
+                <div class="step_button">
+                    <van-button
+                        round
+                        type="info"
+                        style="width: 100%; height: 100%"
+                        v-if="info.initScaleState !== 1"
+                        @click="toQuestion"
+                    >去完成</van-button>
+                </div>
 			</div>
-			<div class="button">
-				<van-button
-					round
-					type="info"
-					style="width: 100%; height: 100%"
-					@click="toQuestion"
-          v-if="info.initScaleState !== 1"
-					>去完成</van-button
-				>
-			</div>
+            <div class="completed" v-show="info.progress === 1 && info.initScaleState === 1">
+                <van-button
+                    round
+                    type="info"
+                    >建模已完成</van-button
+                >
+            </div>
 		</div>
+
 	</div>
 </template>
 
@@ -136,14 +143,13 @@ export default {
                 },
 			}, ssjlToken)
 			if (re.success) {
+                this.info = re.response
 				if (re.response && re.response.state === -1) {
 					this.$toast('用户不存在或未绑定手表')
 				} else if (re.response && re.response.initScaleState === 1 && re.response.progress === 1 && !this.autoJump) {
                     // 2023.6.1 需求变更，建模完成直接跳到心理健康汇总页面
                     this.$router.replace(`/psychologicalMain?uid=${this.uid}&fromUrl=${this.fromUrl || ''}`);
-                } else {
-                    this.info = re.response
-				}
+                }
 			} else {
 				this.$toast(re.msg)
             }
@@ -231,7 +237,6 @@ export default {
 	text-align: left;
 	background: #f4f4f4;
 	padding-bottom: 30vw;
-
 	.tip {
 		display: flex;
 		font-size: 3.3vw;
@@ -264,7 +269,6 @@ export default {
 			}
 		}
 	}
-
 	.step {
 		margin-top: 3vw;
 		padding: 4vw 8vw;
@@ -308,9 +312,29 @@ export default {
 		.sub_title {
 			padding: 3vw 0;
 			color: gray;
-		}
+        }
+        .step_button {
+            height: 14vw;
+            width: 60vw;
+            margin: auto;
+            .van-button--info {
+                background-color: #638ee4;
+                border: 1px solid #638ee4;
+            }
+        }
 	}
-
+    .completed {
+        position: relative;
+        margin-top: 3vw;
+        height: 400px;
+            @include center();
+            .van-button--info {
+                height: 8vh;
+                width: 75vw;
+                background-color: #638ee4;
+                border: 1px solid #638ee4;
+            }
+        }
 	.button {
 		position: fixed;
 		left: 0;