|
@@ -620,6 +620,8 @@
|
|
this.getAction(process.env.VUE_APP_BASE_MATERIAL_URL + '/boss/bossDataExhibitionController/getCompanyMeterialConsume', paramsTwo).then(res => {
|
|
this.getAction(process.env.VUE_APP_BASE_MATERIAL_URL + '/boss/bossDataExhibitionController/getCompanyMeterialConsume', paramsTwo).then(res => {
|
|
if (res.code == 0) {
|
|
if (res.code == 0) {
|
|
resultArray = res.result;
|
|
resultArray = res.result;
|
|
|
|
+ // resultArray.push({area:'聚义',cost:2050422.25},{area:'华南',cost:5050422.25})
|
|
|
|
+ // console.log(resultArray);
|
|
if (resultArray.length > 0) {
|
|
if (resultArray.length > 0) {
|
|
this.emptyShowTwo = true;
|
|
this.emptyShowTwo = true;
|
|
resultArray.forEach(element => {
|
|
resultArray.forEach(element => {
|
|
@@ -771,7 +773,7 @@
|
|
itemGap: 20,
|
|
itemGap: 20,
|
|
itemWidth: 15,
|
|
itemWidth: 15,
|
|
itemHeight: 10,
|
|
itemHeight: 10,
|
|
- padding: [-20, 0, 0, 80],
|
|
|
|
|
|
+ padding: [-40, 0, 0, 80],
|
|
bottom: '55%',
|
|
bottom: '55%',
|
|
formatter: function (name) { //该函数用于设置图例显示后的百分比
|
|
formatter: function (name) { //该函数用于设置图例显示后的百分比
|
|
var data = list
|
|
var data = list
|
|
@@ -869,7 +871,12 @@
|
|
}, {
|
|
}, {
|
|
value: payPersonNum[5],
|
|
value: payPersonNum[5],
|
|
itemStyle: {
|
|
itemStyle: {
|
|
- color: '#40E0D0'
|
|
|
|
|
|
+ color: 'rgba(0,255,127,1.0)'
|
|
|
|
+ }
|
|
|
|
+ },{
|
|
|
|
+ value: payPersonNum[6],
|
|
|
|
+ itemStyle: {
|
|
|
|
+ color: 'rgba(255,192,203,1.0)'
|
|
}
|
|
}
|
|
},
|
|
},
|
|
]
|
|
]
|
|
@@ -907,6 +914,16 @@
|
|
itemStyle: {
|
|
itemStyle: {
|
|
color: 'rgba(182,105,86,.1)'
|
|
color: 'rgba(182,105,86,.1)'
|
|
}
|
|
}
|
|
|
|
+ },{
|
|
|
|
+ value: Math.max.apply(null, payPersonNum),
|
|
|
|
+ itemStyle: {
|
|
|
|
+ color: 'rgba(0,255,127,.1)'
|
|
|
|
+ }
|
|
|
|
+ },{
|
|
|
|
+ value: Math.max.apply(null, payPersonNum),
|
|
|
|
+ itemStyle: {
|
|
|
|
+ color: 'rgba(255,192,203,.1)'
|
|
|
|
+ }
|
|
}
|
|
}
|
|
]
|
|
]
|
|
if (VALUE1.length != VALUE2.length) {
|
|
if (VALUE1.length != VALUE2.length) {
|
|
@@ -963,7 +980,7 @@
|
|
echarts.graphic.registerShape('CubeLeft', CubeLeft)
|
|
echarts.graphic.registerShape('CubeLeft', CubeLeft)
|
|
echarts.graphic.registerShape('CubeRight', CubeRight)
|
|
echarts.graphic.registerShape('CubeRight', CubeRight)
|
|
echarts.graphic.registerShape('CubeTop', CubeTop)
|
|
echarts.graphic.registerShape('CubeTop', CubeTop)
|
|
- const MAX = [300, 300, 300, 300, 300, 300]
|
|
|
|
|
|
+ const MAX = [300, 300, 300, 300, 300, 300,300]
|
|
const VALUE = payPersonNum
|
|
const VALUE = payPersonNum
|
|
let option = {
|
|
let option = {
|
|
backgroundColor: "transparent",
|
|
backgroundColor: "transparent",
|