新改

gavel/src/main/resources/static/css/dashboard/index.css

@@ -60,7 +60,7 @@
     padding: .1rem .2rem .1rem .2rem;
 }
 .center .center-left{
-    width: 30%;
+    width: 25%;
     padding: .1rem;
     /*    border: 1px solid red;*/
 
@@ -181,7 +181,7 @@
     margin-top: 0.1rem;
 }
 .center .center-cen{
-    width: 40%;
+    width: 50%;
     padding: .1rem;
 }
 .center .center-cen .cen-top{
@@ -253,7 +253,7 @@
 }
 
 .center .center-right{
-    width: 30%;
+    width: 25%;
     padding: .1rem;
 }
 

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

@@ -1940,7 +1940,6 @@ $(function () {
 });
 /*时段产量图表*/
 function setTimeProductionEchart(chart,apidata) {
-	console.log(apidata)
 	if(apidata){
 		var list=[]
 		apidata.xseriesList.forEach(function(e,index){
@@ -2023,7 +2022,7 @@ function setTimeProductionEchart(chart,apidata) {
             type: 'category',
             data: dateList,
             axisLabel: {
-				interval: 0,
+				interval: 1,
                 tooltip: {
                     show: true,
                 },
@@ -2032,26 +2031,26 @@ function setTimeProductionEchart(chart,apidata) {
                     fontSize: 12
                 },
                 color: 'rgba(255,255,255,0.6)',
-				// formatter:function(value){
-				//                var str = ""; 
-				//                var num = 4; //每行显示字数 
-				//                var valLength = value.length; //该项x轴字数  
-				//                var rowNum = Math.ceil(valLength / num); // 行数  
+				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;
+				               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;
-				//                } 
-				//            }
+				                       temp = value.substring(start, end) + "\n";
+				                       str += temp; 
+				                   }
+				                   return str;
+				               } else {
+				                   return value;
+				               } 
+				           }
             },
             axisTick: {
                 show: false
@@ -2065,8 +2064,6 @@ function setTimeProductionEchart(chart,apidata) {
         },
         yAxis: [{
             type: 'value',
-			min: 0.0,
-			max: 50.0,
             splitLine: {
                 show: false,
                 lineStyle: {
@@ -2409,10 +2406,12 @@ function setRpcHglEchart(chart,apidata1,apidata2) {
 	let wglist=[]
 	if(apidata1&&apidata2){
 		apidata1.forEach(function(e){
-			datelist.push(e.fkrq)
+			
 			hgllist.push(e.hgl)
 		})
 		apidata2.forEach(function(e){
+			console.log(e.jhrq)
+			datelist.push(e.jhrq.slice(5))
 			jslist.push(e.jhsl)
 			wglist.push(e.wgsl)
 		})
@@ -2574,7 +2573,7 @@ function setRpcHglEchart(chart,apidata1,apidata2) {
             {
                 name: '合格率',
                 type: 'line',
-                yAxisIndex: 1,
+                yAxisIndex: 0,
                 data: hgllist||[20,30,90,30,29],
                 itemStyle:{
                     normal:{

gavel/src/main/resources/templates/views/kmes/dashboard/first.html

@@ -49,7 +49,7 @@
                 </div>
             </div>
             <div class="left-cen rightTop border">
-                <div class="title">日排产达成数据</div>
+                <div class="title">日排产&合格率</div>
                 <div class="bottom-b">
                     <div id="chartRpcdcsj" class="allnav"></div>
                 </div>
@@ -286,14 +286,14 @@
                     </ul>
                 </div>
             </div>
-            <div class="right-cen border">
+            <div class="right-cen border" style="display: none;">
                 <div class="title">合格率</div>
                 <div class="right-cen-cent">
                     <div id="chartHgl" class="allnav"></div>
                 </div>
 
             </div>
-            <div class="right-bottom rightTop border">
+            <div class="right-bottom rightTop border" style="height: 6.8rem;">
                 <div class="title">工艺流程图</div>
                 <div class="chat">
                  <canvas id="gylct" style="width: 100%;height: 100%"></canvas>
@@ -355,8 +355,9 @@
 		}
 		/* 调用 */
 		function getAlldata(){
+			apisetRpcHglEchart(chartRpcdcsj)
 			apisetTimeProductionEchart(myChartSdcl)
-			apisetDailyDataEchart(chartRpcdcsj)
+			// apisetDailyDataEchart(chartRpcdcsj)
 			apisetPieDailyChart(chartRjh)
 			apisetPieDailyCharty(chartYjh)
 			apisetHglEchart(chartHgl)