调整

js/content/mycharts.js

@@ -175,8 +175,28 @@ var ChartsService = {
                         color: '#ffffff', //更改坐标轴文字颜色
                         fontSize: 14 //更改坐标轴文字大小
                     },
-                    interval:0,  
-                    rotate:30
+                    // interval:0,  
+                    // rotate:30
+                     //换行显示
+                     formatter: function(value) {
+                        let result = '' //拼接加\n返回的类目项
+                        let maxLength = 2 //每项显示文字个数
+                        let valLength = value.length //X轴类目项的文字个数
+                        let rowNumber = Math.ceil(valLength / maxLength) //类目项需要换行的行数
+                        if (rowNumber > 1) {
+                        //如果文字大于3,
+                        for (let i = 0; i < rowNumber; i++) {
+                            let temp = '' //每次截取的字符串
+                            let start = i * maxLength //开始截取的位置
+                            let end = start + maxLength //结束截取的位置
+                            temp = value.substring(start, end) + '\n'
+                            result += temp //拼接生成最终的字符串
+                        }
+                        return result
+                        } else {
+                        return value
+                        }
+                    }
                 },
                 axisLine: {
                     lineStyle: {
@@ -275,8 +295,28 @@ var ChartsService = {
                         color: '#ffffff', //更改坐标轴文字颜色
                         fontSize: 14 //更改坐标轴文字大小
                     },
-                    interval:0,  
-                    rotate:30  
+                    // interval:0,  
+                    // rotate:30  
+                     //换行显示
+                    formatter: function(value) {
+                        let result = '' //拼接加\n返回的类目项
+                        let maxLength = 5 //每项显示文字个数
+                        let valLength = value.length //X轴类目项的文字个数
+                        let rowNumber = Math.ceil(valLength / maxLength) //类目项需要换行的行数
+                        if (rowNumber > 1) {
+                        //如果文字大于3,
+                        for (let i = 0; i < rowNumber; i++) {
+                            let temp = '' //每次截取的字符串
+                            let start = i * maxLength //开始截取的位置
+                            let end = start + maxLength //结束截取的位置
+                            temp = value.substring(start, end) + '\n'
+                            result += temp //拼接生成最终的字符串
+                        }
+                        return result
+                        } else {
+                        return value
+                        }
+                    }
                 },
                 axisLine: {
                     lineStyle: {

js/service/material.js

@@ -528,6 +528,7 @@ var ServiceMaterial={
             element.applyPerson=element.cmaker
             element.applysum=element.unfinishedQuantity
             element.cdepName=element.cdepName
+            element.ddate=element.ddate
         });
         
         return materialList;

js/service/produce-task.js

@@ -113,8 +113,9 @@ var ServiceProduceTask = {
             element.materialName=element.cinvname,
             element.specs=element.cinvstd,
             element.planSum=element.qty,
-            element.workHour= 50,
-            element.completeSum=element.qualifiedinqty
+            element.workHour= element.cinvDefine13,
+            element.completeSum=element.qualifiedinqty,
+            element.manHoursInvested=element.manHoursInvested
         })
         
 
@@ -347,7 +348,22 @@ var ServiceProduceTask = {
     },
     //项目进度完工百分比
     getProjectScheduleCompletion:function(){
-        return MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProjectScheduleCompletion");
+        var projectScheduleCompletionList=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProjectScheduleCompletion");
+        projectScheduleCompletionList.forEach(item => {
+            if(!item.numberOfTasks){
+                item.numberOfTasks=0;
+            }
+            if(!item.latestCompletedQuantity){
+                item.latestCompletedQuantity=0;
+            }
+            item.incompleteSum = item.numberOfTasks - item.latestCompletedQuantity;
+            if (item.incompleteSum < 0)
+                item.incompleteSum = 0;
+            item.completePercent = (item.latestCompletedQuantity / item.numberOfTasks * 100).toFixed(0);
+            item.incompletePercent = (100 - item.completePercent) + "%";
+            item.completePercent = item.completePercent + "%";
+        });
+        return projectScheduleCompletionList;
     },
     // 获取到现在为止在进行订单或者项目
     getDoingListByOrder: function () {

pages/dashboard/produce.html

@@ -73,9 +73,11 @@
                     <div style="width: 15%;" class="col-lg-1 col-md-1 center no-padding">产品编码</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">型号规格</div> -->
                     <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">产品名称</div>
-                    <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">计划数量</div>
-                    <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">标准工时</div>
-                    <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">完成进度(已<span style="background-color:#5bc0de">&nbsp;&nbsp;&nbsp;</span>/未<span style="background-color:#f0ad4e">&nbsp;&nbsp;&nbsp;</span>)</div>
+                    <div style="width: 6%;" class="col-lg-1 col-md-1 center no-padding">计划数量</div>
+                    <div style="width: 6%;" class="col-lg-1 col-md-1 center no-padding">标准工时</div>
+                    <div style="width: 6%;" class="col-lg-1 col-md-1 center no-padding">已投入工时</div>
+                    <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">完成进度(已/未)</div>
+                    <!-- <span style="background-color:#5bc0de">&nbsp;&nbsp;&nbsp;</span> -->
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height: 380px;">
@@ -85,8 +87,9 @@
                             <div style="width: 15%;" class="col-lg-1 col-md-1 center no-padding">{{product.materialCode}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div> -->
                             <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">{{product.materialName}}</div>
-                            <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">{{product.planSum}}</div>
-                            <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">{{product.workHour}}</div>
+                            <div style="width: 6%;" class="col-lg-1 col-md-1 center no-padding">{{product.planSum}}</div>
+                            <div style="width: 6%;" class="col-lg-1 col-md-1 center no-padding">{{product.workHour}}</div>
+                            <div style="width: 6%;" class="col-lg-1 col-md-1 center no-padding">{{product.manHoursInvested}}</div>
                             <div style="width: 20%;" 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}">
@@ -94,7 +97,7 @@
                                 </div>
                                 <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60"
                                     aria-valuemin="0" aria-valuemax="100" :style="{width:product.incompletePercent}">
-                                    {{product.incompletePercent}}
+                                    <!-- {{product.incompletePercent}} -->
                                 </div>
                                 
                             </div>
@@ -164,11 +167,11 @@
                             <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}">
-                                    {{product.completeSum}}
+                                    {{product.completePercent}}
                                 </div>
                                 <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60"
                                     aria-valuemin="0" aria-valuemax="100" :style="{width:product.incompletePercent}">
-                                    {{product.incompleteSum}}
+                                    <!-- {{product.incompleteSum}} -->
                                 </div>
                             </div>
                         </div>

pages/dashboard/warehouse.html

@@ -46,7 +46,7 @@
                 <div class="row block-padding">
 
                     <div class="col-lg-12  col-md-12">
-                        <span class="block-title">仓库人员信息</span>
+                        <span class="block-title-important">仓库人员信息</span>
                         &nbsp;&nbsp;
                         <span class="block-title-important">{{userSum}}</span>
                     </div>
@@ -68,7 +68,7 @@
                 <div class="row block-padding">
 
                     <div class="col-lg-12  col-md-12">
-                        <span class="block-title">收料待检</span>
+                        <span class="block-title-important">收料待检</span>
                         &nbsp;&nbsp;
                         <span class="block-title-important">{{waitingcheckMaterialSum}}</span>
                     </div>
@@ -114,7 +114,7 @@
                 <!--安全库存--> 
                 <div class="row block-padding">
 
-                    <div class="col-lg-12 col-md-12 block-title">安全库存</div>
+                    <div class="col-lg-12 col-md-12 block-title-important">安全库存</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-2 col-md-2 center no-padding">产品编码</div>
@@ -179,7 +179,7 @@
                 <div class="row block-padding">
 
                     <div class="col-lg-12  col-md-12">
-                        <span class="block-title">发货通知</span>
+                        <span class="block-title-important">发货通知</span>
                         &nbsp;&nbsp;
                         <span class="block-title-important">{{waitingSendProductSum}}</span>
                     </div>
@@ -225,7 +225,7 @@
                     <div class="row">
                         <div class="row">
                             <!-- <div class="col-lg-12 col-md-12 center block-title">月成品出货统计</div> -->
-                            <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:440px" id="charts_11"></div>
@@ -273,7 +273,7 @@
                     </div> -->
                     <div class="row"  style="height: 49%;">
                         <div class="row">
-                            <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-2" style="height:500px" id="charts_22"></div>
@@ -287,14 +287,14 @@
                 <div class="row block-padding">
 
                     <div class="col-lg-12  col-md-12">
-                        <span class="block-title">工单备料</span>
+                        <span class="block-title-important">工单备料</span>
                         &nbsp;&nbsp;
                         <span class="block-title-important">{{orderSheetMaterialNeedSum}}</span>
                         &nbsp;&nbsp;
                         <span class="block-title-important">{{orderSheetMaterialPercent}}%</span>
                     </div>
                 </div>
-                <div class="row block-padding">
+                <div class="row block-padding" >
                     <div class="col-lg-2 col-md-2 center no-padding">工单号</div>
                     <div class="col-lg-2 col-md-2 center no-padding">产品编码</div>
                     <div class="col-lg-2 col-md-2 center no-padding">产品名称</div>
@@ -326,7 +326,7 @@
                 <div class="row block-padding">
 
                     <div class="col-lg-12  col-md-12">
-                        <span class="block-title">工单缺料明细</span>
+                        <span class="block-title-important">工单缺料明细</span>
                         &nbsp;&nbsp;
                         <span class="block-title-important">{{orderSheetMaterialNotEnoughSum}}</span>
                     </div>
@@ -356,7 +356,7 @@
                 <div class="row block-padding">
 
                     <div class="col-lg-12 ">
-                        <span class="block-title">工单齐套通知</span>
+                        <span class="block-title-important">工单齐套通知</span>
                         &nbsp;&nbsp;
                         <span class="block-title-important">{{orderSheetMaterialEnoughSum}}</span>
                     </div>
@@ -385,7 +385,7 @@
                 <div class="row block-padding">
 
                     <div class="col-lg-12 col-md-12 ">
-                        <span class="block-title">领料申请通知</span>
+                        <span class="block-title-important">领料申请通知</span>
                         &nbsp;&nbsp;
                         <span class="block-title-important">{{applyMaterialSum}}</span>
                     </div>
@@ -402,7 +402,7 @@
                 <div class="row">
                     <div class="col-lg-12 col-md-12"  style="height: 23%;overflow:hidden;min-height:180px">
                         <div class="row" v-for="material in applyMaterialList">
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.orderSheetCode}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.ddate}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.materialName}}</div>
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div> -->
@@ -439,70 +439,73 @@
     <script src="/js/content/mycharts.js?_v=1"></script>
     <script type="text/javascript">
         // 参数说明：beginFun("图表ID"，"list形式数据"，"翻页时间（毫秒）"，"本页面唯一id（不可重复）")
-        // setTimeout(beginFun("charts_11",monthSend,2000,"123123"),500);
-        var interval = setInterval(getMonthSendData,10000);//项目月发货统计
-        var interval1 = setInterval(getMonthSendData1,10000);//成品库存
+        const monthSend = ServiceProduct.getMonthSend();
+        const stockDate = ServiceProduct.getStockList();
+        setTimeout(beginFun("charts_11",monthSend,10000,"123123"),500);
+        setTimeout(beginFun("charts_22",stockDate,10000,"1231231"),500);
+        // var interval = setInterval(getMonthSendData,10000);//项目月发货统计
+        // var interval1 = setInterval(getMonthSendData1,10000);//成品库存
 
         var initSize = 5;
         var pageSize = 5;
         var pageIndex = 0;
-        const monthSend = ServiceProduct.getMonthSend();
-        let monthSendList = [];
-        for(let key in monthSend) {
-            monthSendList.push([key, monthSend[key]]);
-        }
-
-        var pageSize1 = 5;
-        var pageIndex1 = 0;
-        const stockDate = ServiceProduct.getStockList();
-        let stockList = [];
-        for(let key in stockDate) {
-            stockList.push([key, stockDate[key]]);
-        }
-
-
-        function getMonthSendData(){
-            if(monthSendList.length <= initSize){
-                clearInterval(interval);
-            }
-            if(pageIndex >= monthSendList.length){
-                pageSize = 5;
-                pageIndex = 0;
-            }
-            let lsit = monthSendList.slice(pageIndex, pageSize);
-            pageIndex = pageSize;
-            pageSize = pageSize + initSize;
-            let map = {}
-            for(let key in lsit) {
-                map[lsit[key][0]] = lsit[key][1];
-            }
-
-            ChartsService.initCommonBar("charts_11",map);
+        // const monthSend = ServiceProduct.getMonthSend();
+        // let monthSendList = [];
+        // for(let key in monthSend) {
+        //     monthSendList.push([key, monthSend[key]]);
+        // }
+
+        // var pageSize1 = 5;
+        // var pageIndex1 = 0;
+        // // const stockDate = ServiceProduct.getStockList();
+        // let stockList = [];
+        // for(let key in stockDate) {
+        //     stockList.push([key, stockDate[key]]);
+        // }
+
+
+        // function getMonthSendData(){
+        //     if(monthSendList.length <= initSize){
+        //         clearInterval(interval);
+        //     }
+        //     if(pageIndex >= monthSendList.length){
+        //         pageSize = 5;
+        //         pageIndex = 0;
+        //     }
+        //     let lsit = monthSendList.slice(pageIndex, pageSize);
+        //     pageIndex = pageSize;
+        //     pageSize = pageSize + initSize;
+        //     let map = {}
+        //     for(let key in lsit) {
+        //         map[lsit[key][0]] = lsit[key][1];
+        //     }
+
+        //     ChartsService.initCommonBar("charts_11",map);
             
            
-        }
-
-        function getMonthSendData1(){
-
-            if(stockList.length <= initSize){
-                clearInterval(interval1);
-            }
-            if(pageIndex1 >= stockList.length){
-                pageSize1 = 8;
-                pageIndex1 = 0;
-            }
-
-            let lsit1 = stockList.slice(pageIndex1, pageSize1);
-            pageIndex1 = pageSize1;
-            pageSize1 = pageSize1 + initSize;
-            let map = {}
-            for(let key in lsit1) {
-                map[lsit1[key][0]] = lsit1[key][1];
-            }
-            ChartsService.initCommonBar("charts_22",map);
+        // }
+
+        // function getMonthSendData1(){
+
+        //     if(stockList.length <= initSize){
+        //         clearInterval(interval1);
+        //     }
+        //     if(pageIndex1 >= stockList.length){
+        //         pageSize1 = 8;
+        //         pageIndex1 = 0;
+        //     }
+
+        //     let lsit1 = stockList.slice(pageIndex1, pageSize1);
+        //     pageIndex1 = pageSize1;
+        //     pageSize1 = pageSize1 + initSize;
+        //     let map = {}
+        //     for(let key in lsit1) {
+        //         map[lsit1[key][0]] = lsit1[key][1];
+        //     }
+        //     ChartsService.initCommonBar("charts_22",map);
            
 
-        }
+        // }
 
 
 
@@ -699,12 +702,14 @@
                         if (item.needSum * 1 > item.stockSum * 1)
                             orderSheetMaterialStockSum++;
                     });
+                    
                     this.orderSheetMaterialPercent = ((orderSheetMaterialNeedSum -
                             orderSheetMaterialStockSum) /
                         orderSheetMaterialNeedSum * 100).toFixed("0");
+                        
                     this.cacheDataObject.orderSheetMaterialList = {
                         data: orderSheetMaterialList,
-                        pagesize: 9,
+                        pagesize: 5,
                         pageindex: 0
                     }
                     this.orderSheetMaterialList = orderSheetMaterialList.slice(0, this.cacheDataObject
@@ -714,7 +719,7 @@
                     this.orderSheetMaterialNotEnoughSum = orderSheetMaterialNotEnoughList.length;
                     this.cacheDataObject.orderSheetMaterialNotEnoughList = {
                         data: orderSheetMaterialNotEnoughList,
-                        pagesize: 9,
+                        pagesize: 5,
                         pageindex: 0
                     }
                     this.orderSheetMaterialNotEnoughList = orderSheetMaterialNotEnoughList.slice(0, this
@@ -724,7 +729,7 @@
                     this.orderSheetMaterialEnoughSum = orderSheetMaterialEnoughList.length;
                     this.cacheDataObject.orderSheetMaterialEnoughList = {
                         data: orderSheetMaterialEnoughList,
-                        pagesize: 9,
+                        pagesize: 5,
                         pageindex: 0
                     }
                     this.orderSheetMaterialEnoughList = orderSheetMaterialEnoughList.slice(0, this
@@ -739,7 +744,7 @@
                     this.applyCompleteSumPercent = applyCompleteSumPercent + '%';
                     this.cacheDataObject.applyMaterialList = {
                         data: applyMaterialList,
-                        pagesize: 7,
+                        pagesize: 5,
                         pageindex: 0
                     }
                     this.applyMaterialList = applyMaterialList.slice(0, this.cacheDataObject