فهرست منبع

Merge branch 'feature/work-test' of http://git.tjyourong.com.cn/ctop/adsp-vue into feature/work-test

朱鑫波 3 سال پیش
والد
کامیت
51d294ff67
1فایلهای تغییر یافته به همراه20 افزوده شده و 3 حذف شده
  1. 20 3
      src/views/bossDataKanban/index.vue

+ 20 - 3
src/views/bossDataKanban/index.vue

@@ -620,6 +620,8 @@
                 this.getAction(process.env.VUE_APP_BASE_MATERIAL_URL + '/boss/bossDataExhibitionController/getCompanyMeterialConsume', paramsTwo).then(res => {
                     if (res.code == 0) {
                         resultArray = res.result;
+                        // resultArray.push({area:'聚义',cost:2050422.25},{area:'华南',cost:5050422.25})
+                        // console.log(resultArray);
                         if (resultArray.length > 0) {
                             this.emptyShowTwo = true;
                             resultArray.forEach(element => {
@@ -771,7 +773,7 @@
                         itemGap: 20,
                         itemWidth: 15,
                         itemHeight: 10,
-                        padding: [-20, 0, 0, 80],
+                        padding: [-40, 0, 0, 80],
                         bottom: '55%',
                         formatter: function (name) {  //该函数用于设置图例显示后的百分比
                             var data = list
@@ -869,7 +871,12 @@
                 }, {
                     value: payPersonNum[5],
                     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: {
                         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) {
@@ -963,7 +980,7 @@
                 echarts.graphic.registerShape('CubeLeft', CubeLeft)
                 echarts.graphic.registerShape('CubeRight', CubeRight)
                 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
                 let option = {
                     backgroundColor: "transparent",