产线制造平直

pages/dashboard/line.html

@@ -152,10 +152,10 @@
                     <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: 8%;">达成率</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: 7%;">状态</div>
+                    <div class="col-lg-1 col-md-1 center no-padding" style="width: 7%;text-align: left;">状态</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">完成进度(已/未)</div> -->
                 </div>
-                <div class="row" v-for="product in dayProduceTaskList">
+                <div class="row" v-for="product in dayProduceTaskList" style="margin-top: 5px;">
                     <!-- <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding">{{product.projectName}}</div> -->
                     <div style="width: 8%;" class="col-lg-1 col-md-1 center no-padding">{{product.orderSheetCode}}</div>
                     <div style="width: 12%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding">{{product.materialCode}}</div>
@@ -169,8 +169,8 @@
                     <div style="width: 8%;" class="col-lg-1 col-md-1 center no-padding">{{product.name}}</div>
                     <div style="width: 8%;" class="col-lg-1 col-md-1 center no-padding">{{product.achievementRate}}%</div>
                     <div style="width: 8%;" class="col-lg-1 col-md-1 center no-padding">{{product.productionEfficiency}}%</div>
-                    <div style="width: 7%;" class="col-lg-1 col-md-1 center no-padding">     
-                    <strong style="font-size:x-large;" :style="{color:product.color}">·</strong>{{product.stateName}}
+                    <div style="width: 7%;text-align: left;" class="col-lg-1 col-md-1 center no-padding" >     
+                        <strong style="font-size:10px;" :style="{color:product.color}">●</strong>{{product.stateName}}
                     </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"

pages/dashboard/produce.html

@@ -220,27 +220,31 @@
         const weekInBycategoryList = ServiceProduct.getWeekInByCategory();
         setTimeout(beginFun("charts_24",weekInBycategoryList,10000,"charts_24"),500);
 
+
+        
+        var pageSizeMonthGoodB = 3;
+        var pageIndexMonthGoodB = 0;
         const monthExceptionByCategory =  ServiceProduct.getMonthExceptionByCategory();
         // setTimeout(beginFunA("charts_23",monthExceptionByCategory,10000,"charts_23"),500);
         setTimeout(beB,500);
         function beB(){
-            var lsitMonth = monthExceptionByCategory.slice(pageIndexMonthGood,pageSizeMonthGood);
-            pageIndexMonthGood = pageSizeMonthGood;
-            pageSizeMonthGood = pageSizeMonthGood + initSize;
+            var lsitMonth = monthExceptionByCategory.slice(pageIndexMonthGoodB,pageSizeMonthGoodB);
+            pageIndexMonthGoodB = pageSizeMonthGoodB;
+            pageSizeMonthGoodB = pageSizeMonthGoodB + initSize;
             ChartsService.initBarWithTwoNumberRate("charts_23", lsitMonth,
                         ChartsService.getGridSpanSmall());
-            if(monthExceptionByCategory.length <= pageIndexMonthGood){
+            if(monthExceptionByCategory.length <= pageIndexMonthGoodB){
                 return;
             }
             setInterval(beginScrollB,10000);
         }
         function beginScrollB(){
-            var lsitMonth = monthExceptionByCategory.slice(pageIndexMonthGood,pageSizeMonthGood);
-            pageIndexMonthGood = pageSizeMonthGood;
-            pageSizeMonthGood = pageSizeMonthGood + initSize;
-            if(monthExceptionByCategory.length <= pageIndexMonthGood){
-                pageIndexMonthGood = 0;
-                pageSizeMonthGood = initSize;
+            var lsitMonth = monthExceptionByCategory.slice(pageIndexMonthGoodB,pageSizeMonthGoodB);
+            pageIndexMonthGoodB = pageSizeMonthGoodB;
+            pageSizeMonthGoodB = pageSizeMonthGoodB + initSize;
+            if(monthExceptionByCategory.length <= pageIndexMonthGoodB){
+                pageIndexMonthGoodB = 0;
+                pageSizeMonthGoodB = initSize;
             }
             ChartsService.initBarWithTwoNumberRate("charts_23", lsitMonth,
                         ChartsService.getGridSpanSmall());

pages/dashboard/quality.html

@@ -89,7 +89,7 @@
                 </div> -->
             </div>
             <div class="col-lg-4 col-md-4" style="width: 30%;margin-left: 15px;" >
-                <div class="row" style="padding-top:50px;padding-bottom: 50px;">
+                <div class="row" style="padding-top:50px;padding-bottom: 50px;" style="height:200px">
                     <div class="col-lg-6 col-md-6">
                         <div class="quality-block-1 center">当天到货批数</div>
                         <div class="quality-block-2 center">{{todayArriveSum}}</div>
@@ -114,11 +114,11 @@
                     <div class="col-lg-12 col-md-12" style="height:380px;margin-left: -20%;" id="charts_21"></div>
                 </div>
             </div>
-            <div class="col-lg-4 col-md-4" style="width: 35%;">
+            <div class="col-lg-4 col-md-4" style="width: 35%;" >
                 <div class="row block-padding">
                     <div class="col-lg-12 col-md-12 center block-title-important">当前已到货未入库情况</div>
                 </div>
-                <div class="row block-padding">
+                <div class="row block-padding" >
                     <div style="width: 5%;" class="col-lg-1 col-md-1 center no-padding padding-line">序号</div>
                     <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding padding-line">到货日期</div>
                     <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding padding-line">供应商</div>
@@ -128,8 +128,8 @@
                     <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding padding-line">未入库<br />数量</div>
                     <div style="width: 13%;" class="col-lg-1 col-md-1 center no-padding padding-line">项目名</div>
                 </div>
-                <div class="row">
-                    <div class="col-lg-12 col-md-12" >
+                <div class="row" >
+                    <div class="col-lg-12 col-md-12" style="height:100px">
                         <div class="row" v-for="product in waitingInList">
                             <div style="width: 5%;" class="col-lg-1 col-md-1 center no-padding">{{product.index}}</div>
                             <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">{{product.arriveDate}}</div>
@@ -365,7 +365,7 @@
                     const waitingInList = ServiceMaterial.getWatingInList();
                     this.cacheDataObject.waitingInList = {
                         data: waitingInList,
-                        pagesize: 7,
+                        pagesize: 4,
                         pageindex: 0
                     }
                     this.waitingInList = waitingInList.slice(0, this.cacheDataObject