Merge branch 'feat' into develop

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-06-28 17:13:53
+ * @LastEditTime: 2023-06-29 14:22:17
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -569,4 +569,17 @@ update
 `2023.6.28`
 fix
 - 心理监测首页
-    - 修复 是否显示返回文字判断错误的问题
+    - 修复 是否显示返回文字判断错误的问题
+
+
+## v1.0.72
+`2023.6.29`
+update
+- 心理建模进度查询
+    - 增加 不自动跳转参数，autoJump === 1，则不跳转
+    - 增加 进度条详情数值显示
+- 心理监测首页
+    - 增加 抑郁，压力和疲劳心情图标
+
+- 心理监测详情
+    - 修改 图表拐点圆大小

src/config/models.js

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

src/views/health/psychological-main/index.vue

@@ -95,11 +95,11 @@ export default {
             const data = res.data.response;
             this.healhtList = [
                 // 抑郁
-                { value: data.DepScore,  name: '抑郁倾向', class: 'depression', result: data.DepDesc, time: data.DepMeasureTime ? this.$dayjs(data.DepMeasureTime).format('HH:mm'): '', level: data.DepLevel, img: this.calcImg(data.DepLevel) },
+                { value: data.DepScore,  name: '抑郁倾向', class: 'depression', result: data.DepDesc, time: data.DepMeasureTime ? this.$dayjs(data.DepMeasureTime).format('HH:mm'): '', level: data.DepLevel, img: data.DepScore ? this.calcImg(data.DepLevel, 'depression') : ''},
                 // 压力
-                { value: data.StressScore,  name: '压力', class: 'stress', result: data.StressDesc, time: data.StressMeasureTime ? this.$dayjs(data.StressMeasureTime).format('HH:mm') : '', level: data.StressLevel, img: this.calcImg(data.StressLevel) },
+                { value: data.StressScore,  name: '压力', class: 'stress', result: data.StressDesc, time: data.StressMeasureTime ? this.$dayjs(data.StressMeasureTime).format('HH:mm') : '', level: data.StressLevel, img: data.StressScore ? this.calcImg(data.StressLevel, 'stress') : ''},
                 // 疲劳
-                { value: data.TirScore,  name: '疲劳', class: 'tiredness', result: data.TirDesc, time: data.TirMeasureTime ? this.$dayjs(data.TirMeasureTime).format('HH:mm') : '', level: data.TirLevel, img: this.calcImg(data.TirLevel) },
+                { value: data.TirScore,  name: '疲劳', class: 'tiredness', result: data.TirDesc, time: data.TirMeasureTime ? this.$dayjs(data.TirMeasureTime).format('HH:mm') : '', level: data.TirLevel, img: data.TirScore ? this.calcImg(data.TirLevel, 'tiredness') : '' },
             ];
             this.$toast.success('数据加载完成');
         }).catch(() =>{}).finally(() => { this.$toast.clear() })
@@ -125,11 +125,15 @@ export default {
         }
     },
     // 计算表情
-    calcImg(level) {
+    calcImg(level, name) {
         let imgUrl = '';
-        switch(level) {
+        /* imgUrl = require(`@/assets/img/psychological/${name}_${level}.png`); */
+        let numLevel = Number(level);
+        console.log(`@/assets/img/psychological/${name}_${numLevel}.png`);
+        imgUrl = require(`@/assets/img/psychological/${name}_${numLevel + 1}.png`);
+        /* switch(level) {
             case '0':
-                imgUrl = require('@/assets/img/regardless.png');
+                imgUrl = require(`@/assets/img/psychological/${name}_${numLevel + 1}.png`);
             break;
             case '1':
                 imgUrl = require('@/assets/img/regardless.png');
@@ -140,7 +144,7 @@ export default {
             case '3':
                 imgUrl = require('@/assets/img/moderate.png');
             break;
-        }
+        } */
         return imgUrl;
     },
     // 计算颜色

src/views/health/psychological/index.vue

@@ -504,7 +504,7 @@ export default {
                         padding: 10,
                         data: this.emotionData,
                         symbol: "circle",
-                        symbolSize: 15, // 拐点圆的大小
+                        symbolSize: 8, // 拐点圆的大小
                         areaStyle: {},
                         itemStyle: {
                             color: function(params) {
@@ -530,7 +530,7 @@ export default {
                         padding: 10,
                         data: "",
                         symbol: "circle",
-                        symbolSize: 15, // 拐点圆的大小
+                        symbolSize: 8, // 拐点圆的大小
                     },
                     {
                         name: `中度${this.emoName}倾向`,

src/views/psychological-modeling/index.vue

@@ -27,14 +27,14 @@
 						></span>
 						<span>已完成</span>
 					</div>
-					<div class="status" v-else>待完成</div>
+					<div class="status" v-else>{{ stateText}}</div>
 				</div>
 				<div class="schedule">
 					<van-progress
 						:percentage="(info.progress) * 100"
 						stroke-width="10px"
 						color="#638ee4"
-						:show-pivot="false"
+						:show-pivot="true"
 					></van-progress>
 				</div>
 				<div class="sub_title">
@@ -83,7 +83,15 @@ export default {
             isSHowPage: false,
             fromUrl: '',
 		}
-	},
+    },
+    computed: {
+        stateText() {
+            return this.info.progress > 0 ? '进行中' : '待完成';
+        },
+        autoJump() {
+            return this.$route.query.autoJump === '1';
+        }
+    },
 	mounted() {
 		//页面标题
 		window.document.title = '情绪初始化建模'
@@ -130,7 +138,7 @@ export default {
 			if (re.success) {
 				if (re.response && re.response.state === -1) {
 					this.$toast('用户不存在或未绑定手表')
-				} else if (re.response && re.response.initScaleState === 1 && re.response.progress === 1) {
+				} 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 {