1

js/session.js

@@ -100,11 +100,22 @@ function autoInitDate(chartsID,dataMap,autoTime,timeName){
     if(DataList.length < 1){
         return;
     }
+    
     timeName = setInterval(beginFun2(chartsID,DataList,timeName),autoTime);
     
 }
 
 function beginFun2(chartsID,DataList,timeName){
+
+    let lsit = DataList.slice(pageIndex, pageSize);
+    pageIndex = pageSize;
+    pageSize = pageSize + initSize;
+    let map = {}
+    for(let key in lsit) {
+        map[lsit[key][0]] = lsit[key][1];
+    }
+    ChartsService.initCommonBar(chartsID,map);
+
     return function(){autoLoadDate(chartsID,DataList,timeName)} 
 }
 
@@ -113,12 +124,12 @@ function autoLoadDate(chartsID,DataList,timeName){
     if(DataList.length <= initSize){
         clearInterval(timeName);
     }
-    if(pageIndex > DataList.length){
-        pageSize = 8;
+    if(pageIndex >= DataList.length){
+        pageSize = initSize;
         pageIndex = 0;
     }
     let lsit = DataList.slice(pageIndex, pageSize);
-    pageIndex = pageSize+1;
+    pageIndex = pageSize;
     pageSize = pageSize + initSize;
     let map = {}
     for(let key in lsit) {

pages/dashboard/produce.html

@@ -196,6 +196,19 @@
     <script src="/js/service/workhour.js?_v=1"></script>
     <script src="/js/content/mycharts.js?_v=1"></script>
     <script type="text/javascript">
+
+        // 参数说明：beginFun("图表ID"，"list形式数据"，"翻页时间（毫秒）"，"本页面唯一id（不可重复）")
+        // ChartsService.initBarWithShade("charts_24", ServiceProduct.getWeekInByCategory(),
+        //                 ChartsService.getGridSpanSmall());
+        var initSize = 9;
+        var pageSize = 9;
+        var pageIndex = 0;
+        const weekInBycategoryList = ServiceProduct.getWeekInByCategory();
+        setTimeout(beginFun("charts_24",weekInBycategoryList,2000,"charts_24"),500);
+
+
+
+
         var vm = new Vue({
             el: '#div-main',
             data: {
@@ -224,8 +237,8 @@
                         ChartsService.getGridSpanSmall());
                     ChartsService.initBarWithShade("charts_23", ServiceProduct
                         .getMonthExceptionByCategory(), ChartsService.getGridSpanSmall());
-                    ChartsService.initBarWithShade("charts_24", ServiceProduct.getWeekInByCategory(),
-                        ChartsService.getGridSpanSmall());
+                    // ChartsService.initBarWithShade("charts_24", ServiceProduct.getWeekInByCategory(),
+                    //     ChartsService.getGridSpanSmall());
 
                     ChartsService.initCommonPanel("charts_31", ServiceProduct.getProduceRate());
                     // ChartsService.initBarAndLine("charts_32", ServiceWorkhour.getStandAndRealByMaterial());

pages/dashboard/quality.html

@@ -52,23 +52,23 @@
                     <div class="col-lg-12 col-md-12 center block-title">未来3天的到货计划</div>
                 </div>
                 <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: 6%;" class="col-lg-1 col-md-1 center no-padding padding-line">序号</div>
                     <div style="width: 14%;" class="col-lg-2 col-md-2 center no-padding padding-line">计划<br/>到货日期</div>
                     <div style="width: 14%;" class="col-lg-2 col-md-2 center no-padding padding-line">供应商</div>
                     <div style="width: 14%;" class="col-lg-1 col-md-1 center no-padding padding-line">物料号</div>
-                    <div style="width: 25%;" class="col-lg-3 col-md-3 center no-padding padding-line">名称</div>
+                    <div style="width: 24%;" 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: 10%;" class="col-lg-1 col-md-1 center no-padding">到货<br />数量</div>
                     <div  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" v-for="product in willArriveMeterialList" style="overflow:hidden">
-                            <div style="width: 5%;" class="col-lg-1 col-md-1 center no-padding">{{product.index}}</div>
+                        <div class="row" v-for="product in willArriveMeterialList" style="overflow:hidden;word-wrap: break-word;">
+                            <div style="width: 6%;" class="col-lg-1 col-md-1 center no-padding">{{product.index}}</div>
                             <div style="width: 14%;" class="col-lg-2 col-md-2 center no-padding">{{product.arriveDate}}</div>
                             <div style="width: 14%;" class="col-lg-2 col-md-2 center no-padding">{{product.cvenCode}}</div>
                             <div style="width: 14%;" class="col-lg-1 col-md-1 center no-padding">{{product.materialCode}}</div>
-                            <div style="width: 25%;" class="col-lg-3 col-md-1 center">{{product.materialName}}</div>
+                            <div style="width: 24%;" class="col-lg-3 col-md-1 center 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  class="col-lg-1 col-md-3 center no-padding"><!--{{product.memo}}--></div>
@@ -82,8 +82,8 @@
                     <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">
-                <div class="row" style="padding-top:40px;">
+            <div class="col-lg-4 col-md-4" style="width: 33%;">
+                <div class="row" style="padding-top:70px;">
                     <div class="col-lg-6 col-md-6">
                         <div class="quality-block-1 center">当天到货批数</div>
                         <div class="quality-block-2 center">{{todayArriveSum}}</div>
@@ -101,11 +101,11 @@
                         <div class="quality-block-2 center">{{notInSum}}</div>
                     </div>
                 </div>
-                <div class="row" style="margin-top: 30px;">
+                <div class="row" style="margin-top: 80px;">
                     <div class="col-lg-12 col-md-12 center block-title">当月供检验合格率</div>
                 </div>
-                <div class="row">
-                    <div class="col-lg-12 col-md-12" style="height:380px" id="charts_21"></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">
@@ -211,6 +211,14 @@
     <script src="/js/service/product.js?_v=2"></script>
     <script src="/js/content/mycharts.js?_v=2"></script>
     <script type="text/javascript">
+
+        var initSize = 10;
+        var pageSize = 10;
+        var pageIndex = 0;
+        const checkRateByBatchnoList = ServiceMaterial.getCheckRateByBatchno();
+        setTimeout(beginFun("charts_21",checkRateByBatchnoList,5000,"charts_21"),500);
+      
+
         var vm = new Vue({
             el: '#div-main',
             data: {
@@ -263,8 +271,8 @@
                         .getLastSixMonthQualityTargetCompare(), ChartsService.getGridSpanSmall());
                     // ChartsService.initBarWithShade("charts_31", ServiceMaterial.getPassRateByVendor(),
                     //     ChartsService.getGridSpanSmall());
-                    ChartsService.initBarWithShade("charts_21", ServiceMaterial.getCheckRateByBatchno(),
-                        ChartsService.getGridSpanSmall());
+                    // ChartsService.initBarWithShade("charts_21", ServiceMaterial.getCheckRateByBatchno(),
+                    //     ChartsService.getGridSpanSmall());
                     this.loadData();
                     // 开启定时器
                     this.timer_short = setInterval(this.scrollData, 30000);
@@ -306,7 +314,7 @@
                     const willArriveMeterialList = ServiceMaterial.getWillArriveList(3);
                     this.cacheDataObject.willArriveMeterialList = {
                         data: willArriveMeterialList,
-                        pagesize: 10,
+                        pagesize: 15,
                         pageindex: 0
                     }
                     this.willArriveMeterialList = willArriveMeterialList.slice(0, this.cacheDataObject

pages/dashboard/warehouse.html

@@ -463,12 +463,12 @@
             if(monthSendList.length <= initSize){
                 clearInterval(interval);
             }
-            if(pageIndex > monthSendList.length){
+            if(pageIndex >= monthSendList.length){
                 pageSize = 8;
                 pageIndex = 0;
             }
             let lsit = monthSendList.slice(pageIndex, pageSize);
-            pageIndex = pageSize+1;
+            pageIndex = pageSize;
             pageSize = pageSize + initSize;
             let map = {}
             for(let key in lsit) {
@@ -485,13 +485,13 @@
             if(stockList.length <= initSize){
                 clearInterval(interval1);
             }
-            if(pageIndex1 > stockList.length){
+            if(pageIndex1 >= stockList.length){
                 pageSize1 = 8;
                 pageIndex1 = 0;
             }
 
             let lsit1 = stockList.slice(pageIndex1, pageSize1);
-            pageIndex1 = pageSize1+1;
+            pageIndex1 = pageSize1;
             pageSize1 = pageSize1 + initSize;
             let map = {}
             for(let key in lsit1) {