页面跳转

js/content/mycharts.js

@@ -421,7 +421,7 @@ var ChartsService = {
     },
     // 通用的饼图
     // divId:待显示的div id, data：json对象
-    initCommonPie: function (divId, data) {
+    initCommonPie: function (divId, data, colorList) {
         var myChart = echarts.init(document.getElementById(divId));
         const chartData = [];
         var total = 0;
@@ -470,6 +470,9 @@ var ChartsService = {
             }]
         };
 
+        if (colorList != null && colorList != undefined){
+            option.color = colorList;
+        }
         // 使用刚指定的配置项和数据显示图表。
         myChart.setOption(option);
         window.addEventListener("resize", function () {

js/service/product.js

@@ -186,11 +186,11 @@ var ServiceProduct = {
     // 生产效率
     getProduceRate: function () {
         // const rate = 95;
-        var rate=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProductionEfficiency");
-        // return {
-        //     name: "生产效率",
-        //     value: rate
-        // };
+        rate=MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProductionEfficiency");
+        return {
+            name: "生产效率",
+            value: rate
+        };
 
     },
     // 日生产效率

pages/dashboard/produce.html

@@ -45,21 +45,21 @@
                     <div class="col-lg-12 col-md-12 center block-title">生产计划达成率</div>
                 </div>
                 <div class="row block-padding">
-                    <div class="col-lg-12 col-md-12" style="height:280px" id="charts_11"></div>
+                    <div class="col-lg-12 col-md-12" style="height:290px" id="charts_11"></div>
                 </div>
                 <!--月工时分布情况-->
                 <div class="row block-padding">
                     <div class="col-lg-12 col-md-12 center block-title">月工时分布情况</div>
                 </div>
                 <div class="row block-padding">
-                    <div class="col-lg-12 col-md-12" style="height:280px" id="charts_12"></div>
+                    <div class="col-lg-12 col-md-12" style="height:290px" id="charts_12"></div>
                 </div>
                 <!--月质量异常分类 -->
                 <div class="row block-padding">
                     <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:280px" id="charts_13"></div>
+                    <div class="col-lg-12 col-md-12" style="height:290px" id="charts_13"></div>
                 </div>
             </div>
             <div class="col-lg-6 col-md-6">
@@ -78,7 +78,7 @@
                     <div class="col-lg-2 col-md-2 center no-padding">完成进度(已/未)</div>
                 </div>
                 <div class="row">
-                    <div class="col-lg-12 col-md-12" style="height: 360px;">
+                    <div class="col-lg-12 col-md-12" style="height: 380px;">
                         <div class="row" v-for="product in mouthProduceTaskList">
                             <div class="col-lg-1 col-md-1 center no-padding">{{product.orderSheetCode}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{product.projectName}}</div>
@@ -106,13 +106,13 @@
                             <div class="col-lg-12 col-md-12 center block-title">人员出勤率</div>
                         </div>
                         <div class="row">
-                            <div class="col-lg-12 col-md-2" style="height:240px" id="charts_21"></div>
+                            <div class="col-lg-12 col-md-2" style="height:250px" id="charts_21"></div>
                         </div>
                         <div class="row">
                             <div class="col-lg-12 col-md-12 center block-title">当月产品良率</div>
                         </div>
                         <div class="row">
-                            <div class="col-lg-12 col-md-2" style="height:240px" id="charts_22"></div>
+                            <div class="col-lg-12 col-md-2" style="height:250px" id="charts_22"></div>
                         </div>
                     </div>
                     <div class="col-lg-6 col-md-6">
@@ -120,13 +120,13 @@
                             <div class="col-lg-12 col-md-12 center block-title">月制程质量异常</div>
                         </div>
                         <div class="row">
-                            <div class="col-lg-12 col-md-2" style="height:240px" id="charts_23"></div>
+                            <div class="col-lg-12 col-md-2" style="height:250px" id="charts_23"></div>
                         </div>
                         <div class="row">
                             <div class="col-lg-12 col-md-12 center block-title">周成品入库数量</div>
                         </div>
                         <div class="row">
-                            <div class="col-lg-12 col-md-2" style="height:240px" id="charts_24"></div>
+                            <div class="col-lg-12 col-md-2" style="height:250px" id="charts_24"></div>
                         </div>
                     </div>
                 </div>
@@ -142,13 +142,13 @@
                     <div class="col-lg-12 col-md-12 center block-title">标准工时与实际工时对比</div>
                 </div>
                 <div class="row block-padding">
-                    <div class="col-lg-12 col-md-12" style="height:260px" id="charts_32"></div>
+                    <div class="col-lg-12 col-md-12" style="height:280px" id="charts_32"></div>
                 </div>
                 <div class="row block-padding">
                     <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:260px" id="charts_33"></div>
+                    <div class="col-lg-12 col-md-12" style="height:280px" id="charts_33"></div>
                 </div>
             </div>
         </div>
@@ -183,7 +183,7 @@
                     // 关闭定时器
                     clearInterval(this.timer_short);
                     // 刷新报表
-                    ChartsService.initCommonPie("charts_11", ServiceProduceTask.getCompleteInfo());
+                    ChartsService.initCommonPie("charts_11", ServiceProduceTask.getCompleteInfo(), [ '#ff9f7f', '#37a2da']);
                     ChartsService.initCommonPie("charts_12", ServiceWorkhour.getByMaterial());
                     ChartsService.initBarWithShade("charts_13", ServiceProduct
                         .getQualityExceptionByCategory(), ChartsService.getGridSpanSmall());