Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	src/components/echartsPositionPie.vue
#	src/components/echartsTaskPie.vue
main
wuyize 2022-07-14 23:34:33 +08:00
commit 7003e8761c
2 changed files with 40 additions and 6 deletions

View File

@ -58,16 +58,31 @@ export default {
// //
let isAllZero = this.dataList.every(item => { let isAllZero = this.dataList.every(item => {
// console.log(item,"item") // console.log(item,"item")
return item.value === 0 return item.value == 0
}) })
console.log(isAllZero, "isAllZero") console.log(isAllZero, "isAllZero")
let option = null let option = null
if (isAllZero === true) { if (isAllZero == true) {
// for (let i = 0; i < this.dataList.length; i++) {
// this.dataList[i].name = this.dataList[i].name + "" + this.dataList[i].value + ""
// }
console.log(this.dataList, "this.dataListgroup") console.log(this.dataList, "this.dataListgroup")
option = { option = {
tooltip: { tooltip: {
trigger: 'item' trigger: 'item'
}, },
//
// graphic:{
// type:'text',
// left:'27%',
// top:'50%',
// style:{
// text:'',
// textAlign:'center',
// fill:'#000',
// }
// },
series: [ series: [
{ {
name: '统计', name: '统计',
@ -81,7 +96,6 @@ export default {
formatter: '项目暂无进度' formatter: '项目暂无进度'
}, },
emphasis: { emphasis: {
disabled: true,
label: { label: {
show: false, show: false,
fontSize: '40', fontSize: '40',
@ -101,6 +115,9 @@ export default {
] ]
}; };
} else { } else {
// for (let i = 0; i < this.dataList.length; i++) {
// this.dataList[i].name = this.dataList[i].name + "" + this.dataList[i].value + ""
// }
option = { option = {
tooltip: { tooltip: {
trigger: 'item' trigger: 'item'

View File

@ -58,16 +58,31 @@ export default {
// //
let isAllZero = this.dataList.every(item => { let isAllZero = this.dataList.every(item => {
// console.log(item,"item") // console.log(item,"item")
return item.value === 0 return item.value == 0
}) })
console.log(isAllZero, "isAllZero") console.log(isAllZero, "isAllZero")
let option = null let option = null
if (isAllZero === true) { if (isAllZero == true) {
// for (let i = 0; i < this.dataList.length; i++) {
// this.dataList[i].name = this.dataList[i].name + " " + this.dataList[i].value + ""
// }
console.log(this.dataList, "this.dataListgroup") console.log(this.dataList, "this.dataListgroup")
option = { option = {
tooltip: { tooltip: {
trigger: 'item' trigger: 'item'
}, },
//
// graphic:{
// type:'text',
// left:'27%',
// top:'50%',
// style:{
// text:'',
// textAlign:'center',
// fill:'#000',
// }
// },
series: [ series: [
{ {
name: '统计', name: '统计',
@ -81,7 +96,6 @@ export default {
formatter: '项目暂无进度' formatter: '项目暂无进度'
}, },
emphasis: { emphasis: {
disabled:true,
label: { label: {
show: false, show: false,
fontSize: '40', fontSize: '40',
@ -101,6 +115,9 @@ export default {
] ]
}; };
} else { } else {
// for (let i = 0; i < this.dataList.length; i++) {
// this.dataList[i].name = this.dataList[i].name + " " + this.dataList[i].value + ""
// }
option = { option = {
tooltip: { tooltip: {
trigger: 'item' trigger: 'item'