rmdjz
/
ProjectManagement_frontend
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
parent 8c2557697e 3e386b5d64
commit 7003e8761c
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/components/echartsPositionPie.vue
View File

@ -58,16 +58,31 @@ export default {
// 指定图表的配置项和数据
let isAllZero = this.dataList.every(item => {
// console.log(item,"item")
return item.value === 0
return item.value == 0
})
console.log(isAllZero, "isAllZero")
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")
option = {
tooltip: {
trigger: 'item'
},
//文本形式项目暂无进度，缩放有问题
// graphic:{
// type:'text',
// left:'27%',
// top:'50%',
// style:{
// text:'项目暂无进度',
// textAlign:'center',
// fill:'#000',
// }
// },
series: [
{
name: '统计',
@ -81,7 +96,6 @@ export default {
formatter: '项目暂无进度'
},
emphasis: {
disabled: true,
label: {
show: false,
fontSize: '40',
@ -101,6 +115,9 @@ export default {
]
};
} else {
// for (let i = 0; i < this.dataList.length; i++) {
// this.dataList[i].name = this.dataList[i].name + "：" + this.dataList[i].value + "人"
// }
option = {
tooltip: {
trigger: 'item'

23
src/components/echartsTaskPie.vue
View File

@ -58,16 +58,31 @@ export default {
// 指定图表的配置项和数据
let isAllZero = this.dataList.every(item => {
// console.log(item,"item")
return item.value === 0
return item.value == 0
})
console.log(isAllZero, "isAllZero")
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")
option = {
tooltip: {
trigger: 'item'
},
//文本形式项目暂无进度，缩放有问题
// graphic:{
// type:'text',
// left:'27%',
// top:'50%',
// style:{
// text:'项目暂无进度',
// textAlign:'center',
// fill:'#000',
// }
// },
series: [
{
name: '统计',
@ -81,7 +96,6 @@ export default {
formatter: '项目暂无进度'
},
emphasis: {
disabled:true,
label: {
show: false,
fontSize: '40',
@ -101,6 +115,9 @@ export default {
]
};
} else {
// for (let i = 0; i < this.dataList.length; i++) {
// this.dataList[i].name = this.dataList[i].name + " 已完成工作项：" + this.dataList[i].value + "项"
// }
option = {
tooltip: {
trigger: 'item'