调整

js/content/mycharts.js

@@ -339,7 +339,7 @@ var ChartsService = {
                     show: true,
                     textStyle: {
                         color: '#ffffff', //更改坐标轴文字颜色
-                        fontSize: 14 //更改坐标轴文字大小
+                        fontSize: 12 //更改坐标轴文字大小
                     }
                 },
                 axisLine: {

pages/dashboard/line.html

@@ -105,7 +105,7 @@
             </div>
             <div class="col-lg-9" >
                 <div class="row block-padding" style="height: 350px;">
-                    <div style="height: 200px;padding-left: 0px;"  class="col-lg-4 col-md-4 " v-for="task in doingTaskList">
+                    <div style="height: 200px;padding-left: 50px;"  class="col-lg-4 col-md-4 " v-for="task in doingTaskList">
                         <div class="task-block" :class="task.bgcss" style="height: 190px;width: 350px;">
                             <div class="row ">
                                 <div class="col-lg-12 col-md-12 center task-block-title">{{task.displayName}}</div>
@@ -193,9 +193,9 @@
                     <div class="col-lg-1 col-md-1 center no-padding" style="width: 5%;">达成率</div>
                     <div class="col-lg-1 col-md-1 center no-padding" style="width: 5%;">标准工时</div>
                     <div class="col-lg-1 col-md-1 center no-padding" style="width: 5%;">生产效率</div>
-                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;text-align: left;">状态</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 5%;">状态</div>
                     <div class="col-lg-1 col-md-1 center no-padding" style="width: 20%;">工艺流程</div>
-                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 8%;">作业人员</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 10%;">作业人员</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">完成进度(已/未)</div> -->
                 </div>
                 <div class="row" v-for="product in dayProduceTaskList" style="margin-top: 5px;">
@@ -214,7 +214,7 @@
                     <div style="width: 5%;" class="col-lg-1 col-md-1 center no-padding">{{product.achievementRate}}%</div>
                     <div style="width: 5%;" class="col-lg-1 col-md-1 center no-padding">{{product.standardWorkingHours}}</div>
                     <div style="width: 5%;" class="col-lg-1 col-md-1 center no-padding">{{product.productionEfficiency}}%</div>
-                    <div style="width: 7%;text-align: left;" class="col-lg-1 col-md-1 center no-padding" >     
+                    <div style="width: 5%;" class="col-lg-1 col-md-1 center no-padding" >     
                         <strong style="font-size:10px;" :style="{color:product.color}">●</strong>{{product.stateName}}
                     </div>
                     <div style="width: 20%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding" >
@@ -229,7 +229,7 @@
                             </span> 
                         <!-- </span> -->
                     </div>
-                    <div style="width: 8%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding">{{product.name}}</div>  
+                    <div style="width: 10%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding">{{product.name}}</div>  
                     <!-- <div class="col-lg-2 col-md-2 center no-padding progress">
                         <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="60"
                             aria-valuemin="0" aria-valuemax="100" :style="{width:product.completePercent}">

pages/dashboard/produce.html

@@ -221,7 +221,7 @@
         var pageSizeA = 3;
         var pageIndexA = 0;
         const weekInBycategoryList = ServiceProduct.getWeekInByCategory();
-        setTimeout(beginFun("charts_24",weekInBycategoryList,10000,"charts_24"),500);
+        setTimeout(beginFun("charts_24",weekInBycategoryList,10000,"charts_24",ChartsService.getGridSpanSmall()),500);
 
 
         
@@ -314,7 +314,8 @@
 
                     ChartsService.initCommonPanel("charts_31", ServiceProduct.getProduceRate());
                     // ChartsService.initBarAndLine("charts_32", ServiceWorkhour.getStandAndRealByMaterial());
-                    ChartsService.initBarWithShade("charts_33", ServiceProduct.getMonthSendByProject());
+                    ChartsService.initBarWithShade("charts_33", ServiceProduct.getMonthSendByProject(),
+                        ChartsService.getGridSpanSmall());
                     this.loadData();
                     // 开启定时器
                     this.timer_short = setInterval(this.scrollData, 5000);