Merge branch 'master-joke' into 'master'

chore:浙江乙方运维-乙方评估页面优化

chore:浙江乙方运维-乙方评估页面优化

See merge request !1108

@@ -102,7 +102,7 @@ export default {
             selectYearAndMonth.value = year+ '年'+month+'月'
             selectYearAndMonth.value = year+ '年'+month+'月'
         }
         }
 
 
-        // 已关闭事件审批环节平均用时柱状图
+        // 已关闭事件各环节平均用时柱状图
         let workOrderClosedAvg = () => {
         let workOrderClosedAvg = () => {
             let time = getTime();
             let time = getTime();
             let url = "/api-web/bOpsProjectEvaluation/getWorkOrderClosedAvgEcharts?projectId="+props.projectId+"&time="+time;
             let url = "/api-web/bOpsProjectEvaluation/getWorkOrderClosedAvgEcharts?projectId="+props.projectId+"&time="+time;
@@ -134,10 +134,13 @@ export default {
                             }
                             }
                         },
                         },
                         grid:{
                         grid:{
-                            right: '10%'
+                            top: '25%',
+                            right: '5%',
+                            left: '5%',
+                            bottom: '10%'
                         },
                         },
                         title: {
                         title: {
-                            text: '已关闭事件审批环节平均用时',
+                            text: '已关闭事件各环节平均用时',
                             textStyle:{
                             textStyle:{
                                 //文字颜色
                                 //文字颜色
                                 //字体风格,'normal','italic','oblique'
                                 //字体风格,'normal','italic','oblique'
@@ -147,8 +150,11 @@ export default {
                                 //字体系列
                                 //字体系列
                                 fontFamily:'sans-serif',
                                 fontFamily:'sans-serif',
                                 //字体大小
                                 //字体大小
-                                fontSize:14
-                            }
+                                fontSize:14,
+                                marginTop: 14
+                            },
+                            top: '14px',
+                            left: '10px'
                         },
                         },
                         xAxis: {
                         xAxis: {
                             data: xDatas,
                             data: xDatas,
@@ -211,7 +217,7 @@ export default {
         let setOption = (summaryData,id,name) => {
         let setOption = (summaryData,id,name) => {
             let arr = [];
             let arr = [];
             summaryData.forEach(item => {
             summaryData.forEach(item => {
-                arr.push({value: item.SERID, name: item.TIME})
+                arr.push({value: item.COUNT, name: item.STATUS})
             })
             })
             // 指定图表的配置项和数据
             // 指定图表的配置项和数据
             var option = {
             var option = {
@@ -231,6 +237,12 @@ export default {
                         fontSize:14,
                         fontSize:14,
                     }
                     }
                 },
                 },
+                grid:{
+                    top: '10%',
+                    right: '1%',
+                    left: '1%',
+                    bottom: '1%'
+                },
                 tooltip: {
                 tooltip: {
                     triggeer: 'item',
                     triggeer: 'item',
                     formatter: '{b} : {c} ({d}%)'
                     formatter: '{b} : {c} ({d}%)'
@@ -289,7 +301,15 @@ export default {
                                 fontFamily:'sans-serif',
                                 fontFamily:'sans-serif',
                                 //字体大小
                                 //字体大小
                                 fontSize:14
                                 fontSize:14
-                            }
+                            },
+                            top: '14px',
+                            left: '10px'
+                        },
+                        grid:{
+                            top: '25%',
+                            right: '5%',
+                            left: '5%',
+                            bottom: '10%'
                         },
                         },
                         xAxis: {
                         xAxis: {
                             data: xDatas,
                             data: xDatas,
@@ -347,8 +367,11 @@ export default {
                                 //字体系列
                                 //字体系列
                                 fontFamily:'sans-serif',
                                 fontFamily:'sans-serif',
                                 //字体大小
                                 //字体大小
-                                fontSize:14
-                            }
+                                fontSize:14,
+                                marginTop: 14
+                            },
+                            top: '14px',
+                            left: '10px'
                         },
                         },
                         tooltip: {
                         tooltip: {
                             triggeer: 'item',
                             triggeer: 'item',