大屏数据

gavel/src/main/resources/static/js/dashboard/echarts.js

@@ -2012,25 +2012,45 @@ function setTimeProductionEchart(chart,apidata) {
             }
         },
         grid: {
-            top:80,
-            left: 20,
-            bottom: 20,
-            right: 40,
+            top:"10%",
+            left: "5%",
+            bottom: "0%",
+            right: "5%",
             containLabel: true,
         },
         xAxis: {
             type: 'category',
             data: dateList,
             axisLabel: {
-				interval: 4,
+				interval: 1,
                 tooltip: {
                     show: true,
                 },
                 inside: false,
                 textStyle: {
-                    fontSize: 14
+                    fontSize: 12
                 },
-                color: 'rgba(255,255,255,0.6)'
+                color: 'rgba(255,255,255,0.6)',
+				formatter:function(value){
+				               var str = ""; 
+				               var num = 6; //每行显示字数 
+				               var valLength = value.length; //该项x轴字数  
+				               var rowNum = Math.ceil(valLength / num); // 行数  
+				               
+				               if(rowNum > 1) {
+				                   for(var i = 0; i < rowNum; i++) {
+				                       var temp = "";
+				                       var start = i * num;
+				                       var end = start + num;
+				                       
+				                       temp = value.substring(start, end) + "\n";
+				                       str += temp; 
+				                   }
+				                   return str;
+				               } else {
+				                   return value;
+				               } 
+				           }
             },
             axisTick: {
                 show: false
@@ -2040,7 +2060,7 @@ function setTimeProductionEchart(chart,apidata) {
                     color: '#0C1A5B',
                 }
             },
-
+			
         },
         yAxis: [{
             type: 'value',
@@ -2130,13 +2150,17 @@ function setDailyDataEchart(chart,apidata) {
             }
         },
         legend: {
+			align: 'left',
             right:0,
-            orient:"vertical",
+            // orient:"vertical",
+			 x : 'right', //居左显示
+			 y: 'left',    //延Y轴
             textStyle:{
                 color:'white'
             }
         },
         grid: {
+			top:'20%',
             left: '3%',
             right: '4%',
             bottom: '3%',
@@ -2264,6 +2288,13 @@ function setHglEchart(chart,apidata) {
 	}
     var ops= {
         color:["#409eff"],
+		grid: {
+		    top:"10%",
+		    left: "5%",
+		    bottom: "5%",
+		    right: "5%",
+		    containLabel: true,
+		},
         xAxis: {
             type: 'category',
             data:datelist|| ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
@@ -2384,7 +2415,7 @@ function setRpcHglEchart(chart,apidata1,apidata2) {
 		})
 	}
     var ops = {
-        color:["#409eff","#ffd03e"],
+        color:["#409eff","#55ff7f","#ffd03e"],
         // tooltip: {
         //     trigger: 'axis',
         //     axisPointer: {
@@ -2395,7 +2426,7 @@ function setRpcHglEchart(chart,apidata1,apidata2) {
         //     }
         // },
         legend: {
-            data: ['计划', '合格率'],
+            data: ['计划', '完工','合格率'],
             textStyle:{
                 color:'white'
             }
@@ -2495,13 +2526,13 @@ function setRpcHglEchart(chart,apidata1,apidata2) {
             }
         ],
         series: [
-            {
+            {	
                 name: '计划',
                 type: 'bar',
                 data: jslist||[
                     2.6, 5.9, 9.0, 26.4, 28.7,
                 ],
-                barWidth : 30,
+                barWidth : 15,
                 itemStyle:{
                     normal:{
                         label:{
@@ -2516,6 +2547,27 @@ function setRpcHglEchart(chart,apidata1,apidata2) {
 
                 }
             },
+			{
+			    name: '完工',
+			    type: 'bar',
+			    data: wglist||[
+			        2.6, 5.9, 9.0, 26.4, 28.7,
+			    ],
+			    barWidth : 15,
+			    itemStyle:{
+			        normal:{
+			            label:{
+			                show:true,
+			                position:"top",
+			                textStyle:{
+			                    color:"white",
+			                }
+			            }
+			
+			        }
+			
+			    }
+			},
             {
                 name: '合格率',
                 type: 'line',