From bf1f3418893ed76934463a364c282ae4f2d4987d Mon Sep 17 00:00:00 2001 From: JinxChen <2183691628@qq.com> Date: Fri, 30 Jun 2023 10:17:04 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E5=BF=83=E7=90=86=E5=BB=BA?= =?UTF-8?q?=E6=A8=A1=E8=BF=9B=E5=BA=A6=E6=9F=A5=E8=AF=A2=20=20=20=20=20-?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=20=E5=8E=BB=E5=AE=8C=E6=88=90=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E4=BD=8D=E7=BD=AE=20=20=20=20=20-=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=20=E5=BB=BA=E6=A8=A1=E5=AE=8C=E6=88=90=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=20-=20=E5=BF=83=E7=90=86=E7=9B=91=E6=B5=8B=E8=AF=A6?= =?UTF-8?q?=E6=83=85=20=20=20=20=20-=20=E4=BF=AE=E6=94=B9=20=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=88=B0=E6=B1=87=E6=80=BB=E9=A1=B5=E9=9D=A2=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E8=AE=BE=E7=BD=AE=E4=B8=BA=E4=BB=8A=E5=A4=A9=20=20=20?= =?UTF-8?q?=20=20-=20=E4=BF=AE=E6=94=B9=20=E9=87=8D=E5=BA=A6=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E6=98=BE=E7=A4=BA=20=20=20=20=20-=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20=E5=9C=86=E7=8E=AF=E5=9B=BE=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E5=B1=95=E7=A4=BA=E5=87=BA=E7=8E=B0=E6=8D=A2?= =?UTF-8?q?=E8=A1=8C=E7=9A=84=E9=97=AE=E9=A2=98=20=20=20=20=20-=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E9=80=89=E6=8B=A9=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E6=95=B0=E6=8D=AE=E5=90=8E=EF=BC=8C=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E8=BF=98=E6=98=AF=E6=98=BE=E7=A4=BA=EF=BC=9A=E4=BB=8A?= =?UTF-8?q?=E5=A4=A9=E7=9A=84=E9=97=AE=E9=A2=98=20=20=20=20=20-=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E8=BD=BB=E5=BA=A6=E7=96=B2=E5=8A=B3?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20=20=20=20=20-=20=E5=8F=96?= =?UTF-8?q?=E6=B6=88=20=E6=97=A5=E5=8E=86=E7=BB=84=E4=BB=B6=E6=98=9F?= =?UTF-8?q?=E6=9C=9F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 19 ++++++- src/config/models.js | 2 +- src/views/health/psychological/index.scss | 4 +- src/views/health/psychological/index.vue | 39 +++++++++------ src/views/psychological-modeling/index.vue | 58 +++++++++++++++------- 5 files changed, 85 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index bbcf832..b5daa75 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ @@ -582,4 +582,19 @@ update - 增加 抑郁，压力和疲劳心情图标 - 心理监测详情 - - 修改 图表拐点圆大小 \ No newline at end of file + - 修改 图表拐点圆大小 + + +## v1.0.73 +`2023.6.30` +update +- 心理建模进度查询 + - 修改 去完成按钮位置 + - 增加 建模完成提示 +- 心理监测详情 + - 修改 返回到汇总页面日期设置为今天 + - 修改 重度颜色显示 + - 修复 圆环图表的等级展示出现换行的问题 + - 修复 选择历史监测数据后，界面还是显示：今天的问题 + - 修复 轻度疲劳图标显示不正确的问题 + - 取消 日历组件星期显示 \ No newline at end of file diff --git a/src/config/models.js b/src/config/models.js index a1392a3..a3c39ec 100644 --- a/src/config/models.js +++ b/src/config/models.js @@ -5,7 +5,7 @@ * @FilePath: \TelpoH5FrontendWeb\src\config\models.js * @description: */ -export const VERSION_MODEL = '1.0.72F'; //版本号 +export const VERSION_MODEL = '1.0.73F'; //版本号 export const IMAGE_URL = { production: 'http://zfb.ssjlai.com/web/', test: 'http://zfb.ssjlai.com/web/', diff --git a/src/views/health/psychological/index.scss b/src/views/health/psychological/index.scss index ab3c915..3fc5d91 100644 --- a/src/views/health/psychological/index.scss +++ b/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 { diff --git a/src/views/health/psychological/index.vue b/src/views/health/psychological/index.vue index cf5ce60..ebb0e26 100644 --- a/src/views/health/psychological/index.vue +++ b/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; } } } diff --git a/src/views/psychological-modeling/index.vue b/src/views/psychological-modeling/index.vue index cff0766..6abad1f 100644 --- a/src/views/psychological-modeling/index.vue +++ b/src/views/psychological-modeling/index.vue @@ -56,18 +56,25 @@
完成一次“情绪初始化评估”，有助于建立您的个人情绪模型。
+
+ 去完成 +
-
- 去完成 -
+
+ 建模已完成 +
+ @@ -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;