kmesweb大屏调整

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

@@ -3056,8 +3056,12 @@ function setRclHglEchart1 (chart, apidata1, apidata2) {
 			}
 		]
 	};
-	console.log(ops)
+	console.log('渲染合格率')
 	chart.setOption(ops, true);
+	setTimeout(()=>{
+		chart.resize()
+	},1000)
+	
 
 }
 

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

@@ -305,32 +305,11 @@
         </div>
         <div class="center-right fr" style="padding-top: 0;">
             <div class="right-top rightTop border" style="height: 3.175rem;margin-bottom: .2rem;">
-                <div class="title">月计划达成</div>
-                <div class="chart" style="width: calc(100% - 0.2rem);
-    height: 2.6rem;
-    margin-left: 0.1rem;
-    margin-top: 0.1rem;">
-                    <ul style="width: 100%;height: 100%">
-                        <!-- <li style="float: left;width: 50%;height: 100%;position: relative;overflow:hidden;">
-                            <div style="position: absolute;top: 0;bottom: 0.4rem;left: 0;right: 0">
-                                <div id="chartRjh" class="allnav"></div>
-                            </div>
-                            <div style="position: absolute;bottom: 0;right: 0;left: 0;text-align: center">
-                                <div>周计划数：<span id="rjhs">100</span></div>
-                                <div>周完工数：<span id="rwgs">80</span></div>
-                            </div>
-                        </li> -->
-                        <li style="float: left;width: 100%;height: 100%;position: relative;overflow:hidden;">
-                            <div style="position: absolute;top: 0;bottom: 0.4rem;left: 0;right: 0">
-                                <div id="chartYjh" class="allnav"></div>
-                            </div>
-                            <div style="position: absolute;bottom: 0;right: 0;left: 0;text-align: center">
-                                <div>月计划数：<span id="yjhs">3000</span></div>
-                                <div>月完工数：<span id="ywgs">2400</span></div>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
+                <div class="title">合格率</div>
+				<div class="right-cen-cent" style="height: 85%;" >
+				    <div id="chartzzp" class="allnav"  ></div>
+				</div>
+
             </div>
             <div class="right-cen border" style="display: none;">
                 <div class="title">在制品状态</div>
@@ -339,14 +318,23 @@
                 </div>
             </div>
 			<div class="right-cen border" style="height: 3.175rem;margin-bottom: .2rem;">
-               <div class="title">合格率</div>
-                <div class="right-cen-cent">
-                    <div id="chartzzp" class="allnav"></div>
-                </div>
-				<!-- <div class="title">合格率</div>
-				<div class="chat" style="height: 3.1rem;">
-				    <div id="chartRpcdcsj1" class="allnav"></div>
-				</div> -->
+               <div class="title">周计划达成</div>
+                <div class="chart" style="width: calc(100% - 0.2rem);
+                height: 2.6rem;
+                margin-left: 0.1rem;
+                margin-top: 0.1rem;">
+                                <ul style="width: 100%;height: 100%">
+                                    <li style="float: left;width: 100%;height: 100%;position: relative;overflow:hidden;">
+                                        <div style="position: absolute;top: 0;bottom: 0.4rem;left: 0;right: 0">
+                                            <div id="chartRjh" class="allnav"></div>
+                                        </div>
+                                        <div style="position: absolute;bottom: 0;right: 0;left: 0;text-align: center">
+                                          <div>周计划数：<span id="rjhs">100</span></div>
+                                          <div>周完工数：<span id="rwgs">80</span></div>
+                                        </div>
+                                    </li>
+                                </ul>
+                            </div>
 
             </div>
             <div class="right-bottom rightTop border" style="height: 3.8rem;">
@@ -391,12 +379,14 @@
 			},200)
 			
         });
-        // var myChartSdcl = echarts.init(document.getElementById('chartSdcl'));
+
+        var chartRjh=echarts.init(document.getElementById("chartRjh"));
+		setPieDailyChart(chartRjh,80);/*日计划*/
         var chartRpcdcsj=echarts.init(document.getElementById("chartRpcdcsj"),null, {renderer: 'svg'});
 		var chartRpcdcsj1=echarts.init(document.getElementById("chartzzp"),null, {renderer: 'svg'});
         var chartHgl=echarts.init(document.getElementById("chartHgl"),null, {renderer: 'svg'});
         // var chartRjh=echarts.init(document.getElementById("chartRjh"),null, {renderer: 'svg'});
-        var chartYjh=echarts.init(document.getElementById("chartYjh"),null, {renderer: 'svg'});
+        // var chartYjh=echarts.init(document.getElementById("chartYjh"),null, {renderer: 'svg'});
         var chartJdshCirle=echarts.init(document.getElementById("chartJdshCirle"),null, {renderer: 'svg'});
 		// var chartTzzp=echarts.init(document.getElementById("chartzzp"),null, {renderer: 'svg'});
 		// setproduceEchart(chartTzzp)
@@ -405,31 +395,33 @@
 		setRclHglEchart1(chartRpcdcsj1);
         // setHglEchart(chartHgl);/*合格率*/
         // setPieDailyChart(chartRjh,80);
-        setPieDailyChart(chartYjh,80);
+        // setPieDailyChart(chartYjh,80);
 		// setproduceEchart(chartTzzp)
         $('.myscroll').myScroll({
             speed: 60, //数值越大，速度越慢
             rowHeight: 46 //li的高度
         });
 		function echartzsy(){
+			chartRjh.resize()
 			// chartTzzp.resize()
 			// myChartSdcl.resize()
 			chartRpcdcsj.resize()
 			chartRpcdcsj1.resize()
 			chartHgl.resize()
 			// chartRjh.resize()
-			chartYjh.resize()
+			// chartYjh.resize()
 			chartJdshCirle.resize()
 		}
 		/* 调用 */
 		function getAlldata(){
+			apisetPieDailyChart(chartRjh)
 			apiqueryZscl()
 			apiqueryOA()
 			apigetscts($("#aqscts"))
 			// apiCurProZtsl(chartTzzp)
 			apisetRpcHglEchart(chartRpcdcsj,'rcl')
 			apisetRpcHglEchart1(chartRpcdcsj1,'rcl')
-			apisetPieDailyCharty(chartYjh)
+			// apisetPieDailyCharty(chartYjh)
 			apisetHglEchart(chartHgl)
 			apiqueryWo()
 			apiqueryringpoint(chartJdshCirle)