调整

src/app/routes/dashboard/analysis/analysis.component.ts

@@ -323,6 +323,9 @@ export class DashboardAnalysisComponent implements OnInit {
   productivityTotal="";//生产率
   getEfficiencyTotal(){
     this.listOfData.forEach(element => {
+      if(element.numberOfTasksTotal){
+        element.numberOfTasksTotal=Number(element.numberOfTasksTotal).toFixed(0)
+      }
       let numberOfTasksTotal=element.numberOfTasksTotal;//计划数量
       let standardWorkingHoursActualTotal=element.standardWorkingHoursActualTotal;//实际标准工时
       let quantityCompletedTotal=element.quantityCompletedTotal;//完成数量

src/app/routes/fbs-workshop-dispatch-list/add/add.component.ts

@@ -223,7 +223,8 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
     if(data){
       if(data.standardWorkingHoursZ&&event){
         // data.standardWorkingHours=((data.standardWorkingHoursZ/data.plannedQuantity)*event).toFixed(2)
-        data.standardWorkingHours=(data.standardWorkingHoursZ*event).toFixed(1)
+        // data.standardWorkingHours=(data.standardWorkingHoursZ*event).toFixed(1)
+        data.standardWorkingHours=(data.standardWorkingHoursZ*event).toFixed(2)
       }
     }
   }

src/app/routes/fbs-workshop-dispatch-list/list/list.component.ts

@@ -78,7 +78,7 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
           }
         });
         
-        this.getEfficiency(this.dataList); //计算效率
+        this.getEfficiency(this.dataList); //计算效率 计算标准工时
         this.page = response.result; //分页数据
         this.isLoading = false;
         // this.getTotal(); //计算当页的总计数量
@@ -95,7 +95,7 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
     this.fbsWorkshopDispatchList.start = this.datePipe.transform(this.fbsWorkshopDispatchList.start, 'yyyy-MM-dd');
     this.fbsWorkshopDispatchList.end = this.datePipe.transform(this.fbsWorkshopDispatchList.end, 'yyyy-MM-dd');
     let fbsWorkshopDispatchList=JSON.parse(JSON.stringify(this.fbsWorkshopDispatchList));
-    fbsWorkshopDispatchList.pageSize=10000;
+    fbsWorkshopDispatchList.pageSize=-1;
     this.fbsWorkshopDispatchListService.list(fbsWorkshopDispatchList).then(response => {
       if (response.success) {
         //查询成功
@@ -131,7 +131,8 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
     let manHoursCompletedHide=0;//之累计完成数量不为0的
     if (dataList) {
       dataList.forEach(element => {
-        element.standardWorkingHours=Number(element.standardWorkingHours).toFixed(1)
+        // element.standardWorkingHours=Number(element.standardWorkingHours).toFixed(1)
+        element.standardWorkingHours=(Number(element.standardWorkingHoursZ)* Number(element.numberOfTasks)).toFixed(2)
         // this.totalList.plannedQuantity = this.totalList.plannedQuantity + Number(element.plannedQuantity);
         this.totalList.numberOfTasks = this.totalList.numberOfTasks + Number(element.numberOfTasks);
         this.totalList.standardWorkingHours =
@@ -144,12 +145,14 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
           manHoursCompletedHide=manHoursCompletedHide+(Number(element.manHoursCompleted))
         }
       });
-      this.totalList.standardWorkingHours = this.totalList.standardWorkingHours.toFixed(1);
-      this.totalList.manHoursCompleted = this.totalList.manHoursCompleted.toFixed(1);
-      this.totalList.numberEfficiency=((this.totalList.latestCompletedQuantity/this.totalList.numberOfTasks)*100).toFixed(1);
+      // this.totalList.standardWorkingHours = this.totalList.standardWorkingHours.toFixed(1);
+      // this.totalList.manHoursCompleted = this.totalList.manHoursCompleted.toFixed(1);
+      this.totalList.standardWorkingHours = this.totalList.standardWorkingHours.toFixed(2);
+      this.totalList.manHoursCompleted = this.totalList.manHoursCompleted.toFixed(2);
+      this.totalList.numberEfficiency=((this.totalList.latestCompletedQuantity/this.totalList.numberOfTasks)*100).toFixed(0);
       console.log(completeStandardWorkingHours)
       console.log(manHoursCompletedHide)
-      this.totalList.workingHoursEfficiency=((completeStandardWorkingHours/manHoursCompletedHide)*100).toFixed(1);
+      this.totalList.workingHoursEfficiency=((completeStandardWorkingHours/manHoursCompletedHide)*100).toFixed(0);
       this.totalList.plannedQuantity = this.getPlannedQuantityTotal(dataList);
     }
   }
@@ -285,6 +288,7 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
    */
   getEfficiency(dataList) {
     dataList.forEach(element => {
+      element.standardWorkingHours=(Number(element.standardWorkingHoursZ)* Number(element.numberOfTasks)).toFixed(2)
       let numberOfTasks = element.numberOfTasks; //任务数量
       let standardWorkingHours = element.standardWorkingHours; //标准工时
       let latestCompletedQuantity = element.latestCompletedQuantity; //完成数量