aa

js/service/produce-task.js

@@ -342,6 +342,17 @@ var ServiceProduceTask = {
             item.completePercent = (item.completeSum / item.planSum * 100).toFixed(0);
             item.incompletePercent = (100 - item.completePercent) + "%";
             item.completePercent = item.completePercent + "%";
+
+            //当天的
+            //达成率处理
+            if(!item.achievementRate){
+                item.achievementRate=0
+            }
+            //生产率处理 
+            if(!item.productionEfficiency){
+                item.productionEfficiency=0.00
+            }
+
         });
         return taskList;
     },

pages/dashboard/line.html

@@ -65,19 +65,19 @@
                     </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">标准工时与实际工时对比</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height:240px" id="charts_11"></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">良率</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-2" style="height:240px" id="charts_12"></div>
                 </div>
                 <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>
                 <div class="row">
                     <div class="col-lg-12 col-md-2" style="height:240px" id="charts_13"></div>
@@ -132,27 +132,33 @@
                     <div class="col-lg-12 col-md-12 center block-title">生产计划</div>
                 </div>
                 <div class="row block-padding">
-                    <div class="col-lg-2 col-md-2 center no-padding">项目名称</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">项目名称</div>
                     <div class="col-lg-1 col-md-1 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> -->
-                    <div class="col-lg-3 col-md-3 center no-padding">物料名称</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">物料名称</div>
                     <div class="col-lg-1 col-md-1 center no-padding">计划数量</div>
                     <div class="col-lg-1 col-md-1 center no-padding">标准工时</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">完成数量</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">完成工时</div>
                     <div class="col-lg-1 col-md-1 center no-padding">作业人员</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">达成率</div>
                     <div class="col-lg-1 col-md-1 center no-padding">生产效率</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">完成进度(已/未)</div> -->
                 </div>
                 <div class="row" v-for="product in dayProduceTaskList">
-                    <div class="col-lg-2 col-md-2 center no-padding">{{product.projectName}}</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">{{product.projectName}}</div>
                     <div class="col-lg-1 col-md-1 center no-padding">{{product.orderSheetCode}}</div>
                     <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-2 col-md-2 center no-padding">{{product.materialCode}}</div>
                     <!-- <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div> -->
-                    <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-3 col-md-3 left no-padding">{{product.materialName}}</div>
+                    <div style="overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-1 col-md-1 left no-padding">{{product.materialName}}</div>
                     <div class="col-lg-1 col-md-1 center no-padding">{{product.planSum}}</div>
                     <div class="col-lg-1 col-md-1 center no-padding">{{product.workHour}}</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">{{product.latestCompletedQuantity}}</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">{{product.manHoursCompleted}}</div>
                     <div class="col-lg-1 col-md-1 center no-padding">{{product.name}}</div>
                     <div class="col-lg-1 col-md-1 center no-padding">{{product.productionEfficiency}}%</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">{{product.productionEfficiency}}%</div>
                     <!-- <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}">
@@ -167,25 +173,25 @@
             </div>
             <div class="col-lg-3">
                 <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">生产效率</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height:190px" id="charts_21"></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">工时分布</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height:210px" id="charts_22"></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">计划达成率</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height:210px" id="charts_23"></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">人员出勤情况</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height:210px" id="charts_24"></div>
@@ -336,7 +342,7 @@
                     const dayProduceTaskList = ServiceProduceTask.getDayList();
                     this.cacheDataObject.dayProduceTaskList = {
                         data: dayProduceTaskList,
-                        pagesize: 14,
+                        pagesize: 30,
                         pageindex: 0
                     }
                     this.dayProduceTaskList = dayProduceTaskList.slice(0, this.cacheDataObject

pages/dashboard/quality.html

@@ -108,7 +108,7 @@
                     </div>
                 </div>
                 <div class="row" style="margin-top: 10px;">
-                    <div class="col-lg-12 col-md-12 center block-title-important">当月供应商检验合格率</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>
@@ -143,7 +143,7 @@
                     </div>
                 </div>
                 <div class="row block-padding">
-                    <div class="col-lg-12 col-md-12 center block-title-important">年度品质合格率</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>