调整

js/content/mycharts.js

@@ -1194,5 +1194,254 @@ var ChartsService = {
             myChart.resize();
         });
     },
+    initBarAndLine3: function (divId, data, grid) {
+        var myChart = echarts.init(document.getElementById(divId));
+        if (data.length == 0)
+            return;
+        const yLabel1 = data[0].label1;
+        const yLabel2 = data[0].label2;
+        const xDataList = [];
+        const yDataList1 = [];
+        const yDataList2 = [];
+        $.each(data, function (index, item) {
+            xDataList.push(item.label);
+            yDataList1.push(item.sum1);
+            yDataList2.push(item.sum2);
+        });
+
+        // option2 = {
+        //     color: ['#ff9f7f', '#ffd85c'],
+        //     grid:{
+        //         left:"20%",
+        //         right:"10%",
+        //         bottom:"25%",
+        //         top:"10%"
+        //     },
+        //     xAxis: {
+        //         type: 'category',
+        //         boundaryGap: false,
+        //         data: xDataList,
+        //         axisLabel: {
+        //             show: true,
+        //             textStyle: {
+        //                 color: '#ffffff', //更改坐标轴文字颜色
+        //                 fontSize: 14 //更改坐标轴文字大小
+        //             },
+        //             // 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: {
+        //                 type: 'solid',
+        //                 color: '#37a2da', //左边线的颜色
+        //                 width: '1' //坐标线的宽度
+        //             }
+        //         },
+        //         splitLine: {
+        //             show: false
+        //         }
+        //     },
+        //     yAxis: {
+        //         type: 'value',
+        //         axisLabel: {
+        //             show: true,
+        //             textStyle: {
+        //                 color: '#ffffff', //更改坐标轴文字颜色
+        //                 fontSize: 14 //更改坐标轴文字大小
+        //             }
+        //         },
+        //         axisLine: {
+        //             lineStyle: {
+        //                 type: 'solid',
+        //                 color: '#37a2da', //左边线的颜色
+        //                 width: '1' //坐标线的宽度
+        //             }
+        //         },
+        //         splitLine: {
+        //             show: true,
+        //             lineStyle: {
+        //                 color: ['#37a2da'],
+        //                 width: 1,
+        //                 type: 'solid'
+        //             }
+        //         }
+        //     },
+        //     series: [{
+        //         data: yDataList1,
+        //         type: 'line',
+        //         stack: '总量',
+        //         label: {
+        //             show: true
+        //         },
+        //     },
+        //     {
+        //         data: yDataList2,
+        //         type: 'line',
+        //         label: {
+        //             show: true
+        //         },
+        //     }
+        //     ]
+        // };
+        
+
+        var option = {
+            color: ['#37a2da'],
+            grid:{
+                left:"20%",
+                right:"10%",
+                bottom:"25%",
+                top:"10%"
+            },
+            tooltip: {
+                trigger: 'axis'
+            },
+            legend: {
+
+                data: [
+                    // {
+                    //     name: yLabel1,
+                    //     textStyle: {
+                    //         color: '#ffffff'
+                    //     }
+                    // },
+                    {
+                        name: yLabel2,
+                        textStyle: {
+                            color: '#ffffff'
+                        }
+                    }
+                ]
+            },
+            xAxis: {
+                type: 'category',
+                axisTick: {
+                    alignWithLabel: true
+                },
+                data: xDataList,
+                axisLabel: {
+                    show: true,
+                    textStyle: {
+                        color: '#ffffff', //更改坐标轴文字颜色
+                        fontSize: 14 //更改坐标轴文字大小
+                    },
+                    // 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: {
+                        type: 'solid',
+                        color: '#37a2da', //左边线的颜色
+                        width: '1' //坐标线的宽度
+                    }
+                },
+                splitLine: {
+                    show: false
+                }
+            },
+            yAxis: {
+                type: 'value',
+                axisLabel: {
+                    show: true,
+                    formatter:'{value}%',
+                    textStyle: {
+                        color: '#ffffff', //更改坐标轴文字颜色
+                        fontSize: 14 //更改坐标轴文字大小
+                    }
+                },
+                axisLine: {
+                    lineStyle: {
+                        type: 'solid',
+                        color: '#37a2da', //左边线的颜色
+                        width: '1' //坐标线的宽度
+                    }
+                },
+                splitLine: {
+                    show: true,
+                    lineStyle: {
+                        color: ['#37a2da'],
+                        width: 1,
+                        type: 'solid'
+                    }
+                }
+            },
+            series: [
+                // {
+                //     name: yLabel1,
+                //     type: 'line',
+                //     stack: '总量',
+                //     label: {
+                //         show: false
+                //     }
+                //     ,
+                //     data: yDataList1
+                // },
+                {
+                    name: yLabel2,
+                    type: 'bar',
+                    showBackground: true,
+                    backgroundStyle: {
+                        color: 'rgba(220, 220, 220, 0.8)'
+                    },
+                    stack: '总量2',
+                    label: {
+                        show: true,
+                        formatter: '{c}%',//显示百分号
+                        fontSize:16
+                    },
+                    data: yDataList2
+                }
+            ]
+        };
+
+        if (grid != null && grid != undefined){
+            option.grid = grid;
+        }
+        // 使用刚指定的配置项和数据显示图表。
+        myChart.setOption(option);
+        window.addEventListener("resize", function () {
+            myChart.resize();
+        });
+    },
 
 }

js/service/product.js

@@ -225,7 +225,26 @@ var ServiceProduct = {
         // var map=MethodGetService.methodGet("/fbsAbnormalWorkingHours/fbsAbnormalWorkingHoursDescribe/getMonthExceptionByCategory")
         var list=MethodGetService.methodGet("/fbsAbnormalWorkingHours/fbsAbnormalWorkingHoursDescribe/getMonthExceptionByCategoryTwo")
         
+        // if(list&&list.length>0){
+        //     var remainingQuantity=3-(list.length%3);
+        //     if(remainingQuantity!=3){
+        //         for(var i=0;i<remainingQuantity;i++){
+        //             var bu="补"+i
+        //             list.push({label: bu,sum1:0,sum2:0})
+        //         }
+        //     }
+        // }else{
+        //     list=[
+        //        {label:"分类A",sum1: 0,sum2:100},
+        //        {label:"分类B",sum1: 0,sum2:100},
+        //        {label:"分类C",sum1: 0,sum2:100} 
+            
+        //     ]
+        // }
         if(list&&list.length>0){
+            list.forEach(element => {
+                element.sum2=element.sum1
+            });
             var remainingQuantity=3-(list.length%3);
             if(remainingQuantity!=3){
                 for(var i=0;i<remainingQuantity;i++){
@@ -235,9 +254,9 @@ var ServiceProduct = {
             }
         }else{
             list=[
-               {label:"分类A",sum1: 0,sum2:100},
-               {label:"分类B",sum1: 0,sum2:100},
-               {label:"分类C",sum1: 0,sum2:100} 
+               {label:"分类A",sum1:0,sum2:0},
+               {label:"分类B",sum1:0,sum2:0},
+               {label:"分类C",sum1:0,sum2:0} 
             
             ]
         }
@@ -278,28 +297,39 @@ var ServiceProduct = {
     getProduceRate: function () {
         // const rate = 95;
         // rate=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProductionEfficiency");
-        var listOfData=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getSumDispatchReport?def1=1");
-        var productivityTotal=0
-        listOfData.forEach(element => {
-            let standardWorkingHoursActualTotal=element.standardWorkingHoursActualTotal;//实际标准工时
-            let manHoursCompletedTotal=element.manHoursCompletedTotal;//完成工时
-            if(element.projectName==="统计"){
-              productivityTotal=((Number(standardWorkingHoursActualTotal)/Number(manHoursCompletedTotal))*100).toFixed(1)
-            }
-          });
+        // var listOfData=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getSumDispatchReport?def1=1");
+        // var productivityTotal=0
+        // listOfData.forEach(element => {
+        //     let standardWorkingHoursActualTotal=element.standardWorkingHoursActualTotal;//实际标准工时
+        //     let manHoursCompletedTotal=element.manHoursCompletedTotal;//完成工时
+        //     if(element.projectName==="统计"){
+        //       productivityTotal=((Number(standardWorkingHoursActualTotal)/Number(manHoursCompletedTotal))*100).toFixed(1)
+        //     }
+        //   });
+        // return {
+        //     name: "当月生产效率",
+        //     value: productivityTotal
+        // };
+
+        
+        var produceRate=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProduceRateTotal");
         return {
             name: "当月生产效率",
-            value: productivityTotal
+            value: produceRate
         };
-
     },
     // 日生产效率
     getDayProduceRate: function () {
         // const rate = 90;
-        rate=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProductionEfficiency?type=1");
+        // rate=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProductionEfficiency?type=1");
+        // return {
+        //     name: "生产效率",
+        //     value: rate
+        // };
+        var produceRate=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProduceRateTotal");
         return {
             name: "生产效率",
-            value: rate
+            value: produceRate
         };
 
     },

pages/dashboard/produce.html

@@ -234,7 +234,7 @@
             var lsitMonth = monthExceptionByCategory.slice(pageIndexMonthGoodB,pageSizeMonthGoodB);
             pageIndexMonthGoodB = pageSizeMonthGoodB;
             pageSizeMonthGoodB = pageSizeMonthGoodB + initSize;
-            ChartsService.initBarWithTwoNumberRate("charts_23", lsitMonth,
+            ChartsService.initBarAndLine3("charts_23", lsitMonth,
                         ChartsService.getGridSpanSmall());
             if(monthExceptionByCategory.length <= pageIndexMonthGoodB){
                 return;
@@ -249,7 +249,7 @@
                 pageIndexMonthGoodB = 0;
                 pageSizeMonthGoodB = initSize;
             }
-            ChartsService.initBarWithTwoNumberRate("charts_23", lsitMonth,
+            ChartsService.initBarAndLine3("charts_23", lsitMonth,
                         ChartsService.getGridSpanSmall());
         }