Browse Source

Merge branch 'feat' into test

test
chenJinxu 10 months ago
parent
commit
921568b5ea
4 changed files with 33 additions and 26 deletions
  1. +7
    -1
      README.md
  2. +1
    -1
      src/config/models.js
  3. +13
    -13
      src/views/health/psychological/index.vue
  4. +12
    -11
      src/views/health/psychological/report/index.vue

+ 7
- 1
README.md View File

@@ -884,4 +884,10 @@ fix
update
- 心理监测首页
- 修改 标题为心理呵护
- 修改 三个指标文字
- 修改 三个指标文字

## v1.0.113
`2023.12.29`
update
- 心理监测详情,周报
- 修改 legend图例位置

+ 1
- 1
src/config/models.js View File

@@ -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/',


+ 13
- 13
src/views/health/psychological/index.vue View File

@@ -429,7 +429,7 @@ export default {
legend: {
width: "65%",
orient: "horizontal",
right: 'right',
right: '5%',
top: 1,
bottom: "1%",
itemHeight: 12,
@@ -438,31 +438,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: {
@@ -470,16 +470,16 @@ export default {
}
},
{
name: `无${this.emoName}倾向`,
icon: "rect",
name: `重度${this.emoName}倾向`,
itemStyle: {
color: "#62BD48"
color: "#d70d0d",
},
icon: "rect",
textStyle: {
// 项目遗留问题,新项目不需重新转换文字大小
fontSize: 12
}
},
],
formatter: function(name) {
// 自定义显示内容


+ 12
- 11
src/views/health/psychological/report/index.vue View File

@@ -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) {
// 自定义显示内容


Loading…
Cancel
Save