大屏样式调整，api.js安全生产天数渲染改

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

@@ -19,7 +19,7 @@
 			HTTP.post("querySafeDays", {}, function(result) {
 				if (result['success']) {
 				let data=result.data.records
-				dom.text("安全生产天数: "+data||'0'+"天")
+				dom.html("安全生产天数: "+"<span>"+data+"</span>"+"天")
 				} else {
 				console.log("请求失败")
 				}

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

@@ -43,9 +43,9 @@
 				<div style="width: 100%;height: 50%;">
 					数字化柔性自动生产车间看板
 				</div>
-				<div id="aqscts" style="width: 100%;font-size: .2rem;height: .3rem;line-height: .3rem;margin-top: -0.2rem;">
+				<!-- <div id="aqscts" style="width: 100%;font-size: .2rem;height: .3rem;line-height: .3rem;margin-top: -0.2rem;">
 					安全生产天数:0
-				</div>
+				</div> -->
             </div>
             <div class="header-img"></div>
         </div>
@@ -74,6 +74,7 @@
 				                   <p><label for="">实际人数：</label><span id="sdrs">20</span></p>
 				                   <p><label for="">休假人数：</label><span id="xjrs">0</span> </p>
 				                   <p><label for="">总生产量：</label><span id="zscl">0</span></p>
+								   <p id="aqscts" style="font-size: 18px;"></p>
 				               </div>
 				           </div>
 				   </div>
@@ -81,7 +82,7 @@
             </div>
             <div class="left-bottom rightTop border" style="height: 3.8rem;">
                 <div class="title">静电手环</div>
-                <div class="bottom-b" style="height: 3rem;">
+                <div class="bottom-b" style="height: 3.1rem;">
                     <div id="chartJdsh" class="allnav">
                         <div class="allnav-left">
                             <div class="circle " id="chartJdshCirle" ></div>
@@ -134,7 +135,7 @@
             </div>
             <div class="cen-bottom rightTop border" style="height: 3.8rem;">
                 <div class="title">生产进度跟踪</div>
-                <div class="bottom-b" style="height: 3rem;">
+                <div class="bottom-b" style="height: 3.1rem;">
                     <div id="chartScjdgz" class="allnav">
                         <div class="echart wenzi">
                             <div class="gun">
@@ -284,13 +285,13 @@
         </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="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;">
+                        <!-- <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>
@@ -298,8 +299,8 @@
                                 <div>周计划数：<span id="rjhs">100</span></div>
                                 <div>周完工数：<span id="rwgs">80</span></div>
                             </div>
-                        </li>
-                        <li style="float: left;width: 50%;height: 100%;position: relative;overflow:hidden;">
+                        </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>
@@ -326,7 +327,7 @@
             </div>
             <div class="right-bottom rightTop border" style="height: 3.8rem;">
 				<div class="title">日产量&合格率</div>
-				<div class="chat" style="height: 3rem;">
+				<div class="chat" style="height: 3.1rem;">
 				    <div id="chartRpcdcsj" class="allnav"></div>
 				</div>
 				<!-- <div class="title">OA考勤</div>
@@ -368,7 +369,7 @@
         // var myChartSdcl = echarts.init(document.getElementById('chartSdcl'));
         var chartRpcdcsj=echarts.init(document.getElementById("chartRpcdcsj"),null, {renderer: 'svg'});
         var chartHgl=echarts.init(document.getElementById("chartHgl"),null, {renderer: 'svg'});
-        var chartRjh=echarts.init(document.getElementById("chartRjh"),null, {renderer: 'svg'});
+        // var chartRjh=echarts.init(document.getElementById("chartRjh"),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'});
@@ -376,7 +377,7 @@
         // oaechart(myChartSdcl);    /*oa*/
         setRclHglEchart(chartRpcdcsj); /*日排产达成数据*/
         // setHglEchart(chartHgl);/*合格率*/
-        setPieDailyChart(chartRjh,80);/*日计划*/
+        // setPieDailyChart(chartRjh,80);
         setPieDailyChart(chartYjh,80);
 		setproduceEchart(chartTzzp)
         $('.myscroll').myScroll({
@@ -388,7 +389,7 @@
 			// myChartSdcl.resize()
 			chartRpcdcsj.resize()
 			chartHgl.resize()
-			chartRjh.resize()
+			// chartRjh.resize()
 			chartYjh.resize()
 			chartJdshCirle.resize()
 		}
@@ -400,7 +401,7 @@
 			apisetRpcHglEchart(chartRpcdcsj,'rcl')
 			// apisetTimeProductionEchart(myChartSdcl)
 			// apisetDailyDataEchart(chartRpcdcsj)
-			apisetPieDailyChart(chartRjh)
+			// apisetPieDailyChart(chartRjh)
 			apisetPieDailyCharty(chartYjh)
 			apisetHglEchart(chartHgl)
 			apiqueryWo()