Merge branch 'develop'

README.md

@@ -877,4 +877,10 @@ update
 update
 - 心理监测首页
     - 修改 标题为心理呵护
-    - 修改 三个指标文字
+    - 修改 三个指标文字
+
+## v1.0.113
+`2023.12.29`
+update
+- 心理监测详情，周报
+    - 修改 legend图例位置

src/config/models.js

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

src/views/health/psychological/index.vue

@@ -405,7 +405,7 @@ export default {
                 legend: {
                     width: "65%",
                     orient: "horizontal",
-                    right: 'right',
+                    right: '5%',
                     top: 1,
                     bottom: "1%",
                     itemHeight: 12,
@@ -414,31 +414,31 @@ export default {
                     align: 'left',
                     selectedMode: false,
                     data: [
-
                         {
-                            name: `轻度${this.emoName}倾向`,
+                            name: `无${this.emoName}倾向`,
                             icon: "rect",
                             itemStyle: {
-                                color: "#ffde00"
+                                color: "#62BD48"
                             },
                             textStyle: {
+                                // 项目遗留问题，新项目不需重新转换文字大小
                                 fontSize: 12
                             }
                         },
                         {
-                            name: `中度${this.emoName}倾向`,
+                            name: `轻度${this.emoName}倾向`,
+                            icon: "rect",
                             itemStyle: {
-                                color: "#ff8a00"
+                                color: "#ffde00"
                             },
-                            icon: "rect",
                             textStyle: {
                                 fontSize: 12
                             }
                         },
                         {
-                            name: `重度${this.emoName}倾向`,
+                            name: `中度${this.emoName}倾向`,
                             itemStyle: {
-                                color: "#d70d0d",
+                                color: "#ff8a00"
                             },
                             icon: "rect",
                             textStyle: {
@@ -446,16 +446,16 @@ export default {
                             }
                         },
                         {
-                            name: `无${this.emoName}倾向`,
-                            icon: "rect",
+                            name: `重度${this.emoName}倾向`,
                             itemStyle: {
-                                color: "#62BD48"
+                                color: "#d70d0d",
                             },
+                            icon: "rect",
                             textStyle: {
-                                // 项目遗留问题，新项目不需重新转换文字大小
                                 fontSize: 12
                             }
                         },
+                        
                     ],
                     formatter: function(name) {
                         // 自定义显示内容
@@ -1143,7 +1143,7 @@ export default {
         },
         //   返回
         onNavBack() {
-            this.params.name = '';
+            /* this.params.name = ''; */
             this.$router.replace({
                 name: 'psychologicalMain',
                 query: {

src/views/health/psychological/report/index.vue

@@ -285,7 +285,7 @@ export default {
                 legend: {
                     width: "65%",
                     orient: "horizontal",
-                    right: 'right',
+                    right: '5%',
                     top: '3%',
                     bottom: "1%",
                     itemHeight: 12,
@@ -295,29 +295,29 @@ export default {
                     selectedMode: false,
                     data: [
                         {
-                            name: `轻度${this.emoName}倾向`,
+                            name: `无${this.emoName}倾向`,
                             icon: "rect",
                             itemStyle: {
-                                color: "#ffde00"
+                                color: "#62BD48"
                             },
                             textStyle: {
                                 fontSize: 12
                             }
                         },
                         {
-                            name: `中度${this.emoName}倾向`,
+                            name: `轻度${this.emoName}倾向`,
+                            icon: "rect",
                             itemStyle: {
-                                color: "#ff8a00"
+                                color: "#ffde00"
                             },
-                            icon: "rect",
                             textStyle: {
                                 fontSize: 12
                             }
                         },
                         {
-                            name: `重度${this.emoName}倾向`,
+                            name: `中度${this.emoName}倾向`,
                             itemStyle: {
-                                color: "#d70d0d",
+                                color: "#ff8a00"
                             },
                             icon: "rect",
                             textStyle: {
@@ -325,15 +325,16 @@ export default {
                             }
                         },
                         {
-                            name: `无${this.emoName}倾向`,
-                            icon: "rect",
+                            name: `重度${this.emoName}倾向`,
                             itemStyle: {
-                                color: "#62BD48"
+                                color: "#d70d0d",
                             },
+                            icon: "rect",
                             textStyle: {
                                 fontSize: 12
                             }
                         },
+                        
                     ],
                     formatter: function(name) {
                         // 自定义显示内容