Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/views/BI/index.vue
pull/2/head
dearlin 2023-11-15 17:33:05 +08:00
commit 18a8e2e92a
1 changed files with 17 additions and 8 deletions

View File

@ -540,16 +540,25 @@ export default {
).then((data) => { ).then((data) => {
var yinhuanCount = [] var yinhuanCount = []
data.valList.forEach((item, index) => { data.valList.forEach((item, index) => {
if (item.HIDDENLEVEL == 'hiddenLevel1001') { // // if (item.HIDDENLEVEL == 'hiddenLevel1001') { //
// yinhuanCount[0] = item.count
// } else if (item.HIDDENLEVEL == 'hiddenLevel1002') { //
// yinhuanCount[1] = item.count
// } else if (item.HIDDENLEVEL == 'pecial') { //
// yinhuanCount[2] = item.count
// } else if (item.HIDDENLEVEL == 'jdyh001') { //
// yinhuanCount[3] = item.count
// } else if (item.HIDDENLEVEL == 'hiddenLevel2002') { //
// yinhuanCount[4] = item.count
// }
if (item.HIDDENLEVEL == 'hiddenLevel1004') { //
yinhuanCount[0] = item.count yinhuanCount[0] = item.count
} else if (item.HIDDENLEVEL == 'hiddenLevel1002') { // }else if (item.HIDDENLEVEL == 'hiddenLevel1002') { //
yinhuanCount[1] = item.count yinhuanCount[1] = item.count
} else if (item.HIDDENLEVEL == 'pecial') { // } else if (item.HIDDENLEVEL == 'jdyh001') { //
yinhuanCount[2] = item.count yinhuanCount[2] = item.count
} else if (item.HIDDENLEVEL == 'jdyh001') { //
yinhuanCount[3] = item.count
} else if (item.HIDDENLEVEL == 'hiddenLevel2002') { // } else if (item.HIDDENLEVEL == 'hiddenLevel2002') { //
yinhuanCount[4] = item.count yinhuanCount[3] = item.count
} }
}) })
this.initEcharts5(yinhuanCount) this.initEcharts5(yinhuanCount)
@ -1056,8 +1065,8 @@ export default {
labelLine: { labelLine: {
normal: { normal: {
show: true, show: true,
length: 10, length: 15,
length2: 10 length2: 15
} }
}, },
label: { label: {