品质

js/content/mycharts.js

@@ -801,7 +801,7 @@ var ChartsService = {
                 },
                 {
                     name: yLabel2,
-                    type: 'line',
+                    type: 'bar',
                     stack: '总量2',
                     label: {
                         show: true

js/service/material.js

@@ -713,9 +713,9 @@ var ServiceMaterial={
         //     "07006":97
         // }
         var map=MethodGetService.methodGet("/fbsPuArrivalvouch/fbsPuArrivalvouch/getCheckRateByBatchno");
-        //补上最后不足10
+        //补上最后不足7
         if(map){
-            var remainingQuantity=10-(Object.keys(map).length%10);
+            var remainingQuantity=7-(Object.keys(map).length%7);
             for(var i=0;i<remainingQuantity;i++){
                 var bu="补"+i
                 console.log(bu)
@@ -807,7 +807,13 @@ var ServiceMaterial={
                 item.unpassSum=0
                 item.passRate=0+"%";
             }else{
-                item.passRate = ((item.checkSum-item.unpassSum)/item.checkSum*100).toFixed(0)+"%";
+                // item.passRate = ((item.checkSum-item.unpassSum)/item.checkSum*100).toFixed(0)+"%";
+                if(item.arriveSum-item.unpassSum===0){
+                    item.passRate="0%";
+                }else{
+                    item.passRate = (item.arriveSum-item.unpassSum/item.arriveSum*100).toFixed(0)+"%";
+                }
+                
             }
            
             

pages/dashboard/quality.html

@@ -53,9 +53,9 @@
     </div>
     <div class="my-container" id="div-main">
         <div class="row" style="font-size:18px;">
-            <div class="col-lg-4 col-md-4">
+            <div class="col-lg-4 col-md-4" style="width: 34%;">
                 <div class="row block-padding">
-                    <div class="col-lg-12 col-md-12 center block-title">未来3天的到货计划</div>
+                    <div class="col-lg-12 col-md-12 center block-title-important">未来3天的到货计划</div>
                 </div>
                 <div class="row block-padding">
                     <div style="width: 6%;" class="col-lg-1 col-md-1 center no-padding padding-line">序号</div>
@@ -77,7 +77,7 @@
                             <div style="overflow:hidden; word-break:break-all;white-space:nowrap;width: 20%;" class="col-lg-2 col-md-1 left no-padding">{{product.materialName}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div> -->
                             <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">{{product.arriveSum}}</div>
-                            <div style="width: 14%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-2 col-md-3 center no-padding">{{product.citemname}}</div>
+                            <div style="width: 14%;overflow:hidden; word-break:break-all;white-space:nowrap;text-align: left;" class="col-lg-2 col-md-3 center no-padding">{{product.citemname}}</div>
                         </div>
                     </div>
                 </div>
@@ -88,7 +88,7 @@
                     <div class="col-lg-12 col-md-12" style="height:300px" id="charts_11"></div>
                 </div> -->
             </div>
-            <div class="col-lg-4 col-md-4" style="width: 33%;">
+            <div class="col-lg-4 col-md-4" style="width: 30%;margin-left: 10px;" >
                 <div class="row" style="padding-top:50px;padding-bottom: 50px;">
                     <div class="col-lg-6 col-md-6">
                         <div class="quality-block-1 center">当天到货批数</div>
@@ -108,42 +108,42 @@
                     </div>
                 </div>
                 <div class="row" style="margin-top: 10px;">
-                    <div class="col-lg-12 col-md-12 center block-title">当月供应商检验合格率</div>
+                    <div class="col-lg-12 col-md-12 center block-title-important">当月供应商检验合格率</div>
                 </div>
                 <div class="row" style="width: 150%;">
                     <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">
+            <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">当前已到货未入库情况</div>
+                    <div class="col-lg-12 col-md-12 center block-title-important">当前已到货未入库情况</div>
                 </div>
                 <div class="row block-padding">
-                    <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding padding-line">序号</div>
+                    <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">计划<br/>到货日期</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>
-                    <div style="width: 18%;" class="col-lg-2 col-md-2 center no-padding padding-line">名称</div>
+                    <div style="width: 17%;" class="col-lg-2 col-md-2 center no-padding padding-line">物料号</div>
+                    <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding padding-line">名称</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding padding-line">型号规格</div> -->
                     <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding padding-line">到货<br />数量</div>
-                    <div style="width: 17%;" class="col-lg-1 col-md-1 center no-padding padding-line">项目名</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" style="min-height: 180px;height: 180px;">
                         <div class="row" v-for="product in waitingInList">
-                            <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">{{product.index}}</div>
+                            <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>
                             <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">{{product.cVenCode}}</div>
-                            <div style="width: 15%;overflow:hidden; word-break:break-all;white-space:nowrap;" class="col-lg-2 col-md-2 left no-padding">{{product.materialCode}}</div>
-                            <div style="width: 18%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-2 col-md-2 left no-padding">{{product.materialName}}</div>
+                            <div style="width: 17%;overflow:hidden; word-break:break-all;white-space:nowrap;" class="col-lg-2 col-md-2 left no-padding">{{product.materialCode}}</div>
+                            <div style="width: 20%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-2 col-md-2 left no-padding">{{product.materialName}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div> -->
                             <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">{{product.arriveSum}}</div>
-                            <div style="width: 17%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 center no-padding">{{product.cItemName}}</div>
+                            <div style="width: 13%;overflow:hidden; word-break:break-all;white-space:nowrap;text-align: left;" class="col-lg-1 col-md-1 center no-padding">{{product.cItemName}}</div>
                         </div>
                     </div>
                 </div>
                 <div class="row block-padding">
-                    <div class="col-lg-12 col-md-12 center block-title">年度合格率</div>
+                    <div class="col-lg-12 col-md-12 center block-title-important">年度品质合格率</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height:300px" id="charts_11"></div>
@@ -162,16 +162,16 @@
             </div> -->
             <d class="col-md-6 col-lg-6" style="margin-top:-40px ;">
                 <div class="row block-padding">
-                    <div class="col-lg-12 col-md-12 center block-title">质量异常信息</div>
+                    <div class="col-lg-12 col-md-12 center block-title-important">质量异常信息</div>
                 </div>
                 <div class="row">
                     <div style="width:5%" class="col-lg-1 col-md-1 center no-padding padding-line">序号</div>
-                    <div style="width:10%" 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>
                     <div style="width:10%" class="col-lg-1 col-md-2 center no-padding padding-line">供应商</div>
                     <div style="width:13%" class="col-lg-2 col-md-2 center no-padding padding-line">物料号</div>
-                    <div style="width:20%" class="col-lg-3 col-md-3 center no-padding padding-line">名称</div>
+                    <div style="width:25%" class="col-lg-3 col-md-3 center no-padding padding-line">物料名称</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding padding-line">型号规格</div> -->
-                    <div style="width:25%;margin-left: 7px;" class="col-lg-3 col-md-3 center no-padding">
+                    <div style="width:30%;margin-left: 7px;" class="col-lg-3 col-md-3 center no-padding">
                         <div class="row">
                             <div class="col-lg-3 col-md-3 center no-padding">到货<br />数量</div>
                             <div class="col-lg-3 col-md-3 center no-padding">抽检<br />数量</div>
@@ -183,12 +183,12 @@
                 </div>
                 <div class="row" v-for="material in unpassList" :class="material.bg">
                     <div style="width:5%"  class="col-lg-1 col-md-1 center no-padding">{{material.index}}</div>
-                    <div style="width:10%"  class="col-lg-2 col-md-2 center no-padding">{{material.checkDate}}</div>
+                    <div style="width:15%"  class="col-lg-2 col-md-2 center no-padding">{{material.checkDate}}</div>
                     <div style="width:10%"  class="col-lg-1 col-md-2 center no-padding">{{material.vendorName}} </div>
                     <div style="width:13%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
-                    <div style="width:20%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-3 col-md-3 left no-padding">{{material.materialName}}</div>
+                    <div style="width:25%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-3 col-md-3 left no-padding">{{material.materialName}}</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div> -->
-                    <div style="width:25%;margin-left: 7px;" class="col-lg-3 col-md-3 center no-padding">
+                    <div style="width:30%;margin-left: 7px;" class="col-lg-3 col-md-3 center no-padding">
                         <div class="row">
                             <div class="col-lg-3 col-md-3 center no-padding">{{material.arriveSum}}</div>
                             <div class="col-lg-3 col-md-3 center no-padding">{{material.checkSum}}</div>
@@ -222,12 +222,40 @@
     <script src="/js/content/mycharts.js?_v=2"></script>
     <script type="text/javascript">
 
-        var initSize = 10;
-        var pageSize = 10;
+        var initSize = 7;
+        var pageSize = 7;
         var pageIndex = 0;
         const checkRateByBatchnoList = ServiceMaterial.getCheckRateByBatchno();
         setTimeout(beginFun("charts_21",checkRateByBatchnoList,10000,"charts_21"),500);
       
+        //年度合格率
+        const monthGoodList =  ServiceMaterial.getLastSixMonthQualityTargetCompare()
+        setTimeout(beA,500);
+        var pageSizeMonthGood = 6;
+        var pageIndexMonthGood = 0;
+        function beA(){
+            var lsitMonth = monthGoodList.slice(pageIndexMonthGood,pageSizeMonthGood);
+            pageIndexMonthGood = pageSizeMonthGood;
+            pageSizeMonthGood = pageSizeMonthGood + 6;
+            ChartsService.initBarAndLine("charts_11", lsitMonth,
+                        ChartsService.getGridSpanSmall());
+            if(monthGoodList.length <= pageIndexMonthGood){
+                return;
+            }
+            setInterval(beginScrollA,10000);
+        }
+        function beginScrollA(){
+            var lsitMonth = monthGoodList.slice(pageIndexMonthGood,pageSizeMonthGood);
+            pageIndexMonthGood = pageSizeMonthGood;
+            pageSizeMonthGood = pageSizeMonthGood + 6;
+            if(monthGoodList.length <= pageIndexMonthGood){
+                pageIndexMonthGood = 0;
+                pageSizeMonthGood = 6;
+            }
+            ChartsService.initBarAndLine("charts_11", lsitMonth,
+                        ChartsService.getGridSpanSmall());
+        }
+        
 
         var vm = new Vue({
             el: '#div-main',
@@ -277,8 +305,8 @@
                     // 关闭质量异常定时器
                     clearInterval(this.timer_quality);
                     // 刷新报表
-                    ChartsService.initBarAndLine("charts_11", ServiceMaterial
-                        .getLastSixMonthQualityTargetCompare(), ChartsService.getGridSpanSmall());
+                    // ChartsService.initBarAndLine("charts_11", ServiceMaterial
+                    //     .getLastSixMonthQualityTargetCompare(), ChartsService.getGridSpanSmall());
                     // ChartsService.initBarWithShade("charts_31", ServiceMaterial.getPassRateByVendor(),
                     //     ChartsService.getGridSpanSmall());
                     // ChartsService.initBarWithShade("charts_21", ServiceMaterial.getCheckRateByBatchno(),
@@ -342,6 +370,8 @@
                     }
                     this.waitingInList = waitingInList.slice(0, this.cacheDataObject
                         .waitingInList.pagesize);
+                    //
+                    
                     // 当天到货批数
                     this.todayArriveSum = ServiceMaterial.getTodayArriveSum();
                     // 未来3天到货