首页 扫码

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

@@ -180,7 +180,7 @@
           <ng-container *ngIf="data.projectName==='统计'">
           <td nzLeft="0px" style="background-color:rgb(223, 223, 219)"></td>
           <td nzLeft="58px" style="background-color:rgb(223, 223, 219);font-weight:bolder" nzAlign="center">剩余工时</td>
-          <td nzLeft="157px" style="background-color:rgb(223, 223, 219)" nzAlign="center">{{data.standardWorkingHoursTotal-data.manHoursCompletedTotal}}</td>
+          <td nzLeft="157px" style="background-color:rgb(223, 223, 219)" nzAlign="center">{{data.remainingWorkTotal}}</td>
           <td nzLeft="265px" style="background-color:rgb(223, 223, 219);font-weight:bolder" nzAlign="center">统计</td>
           <td  nzLeft="383px"></td>
           <td nzLeft="580px" nzAlign="center">{{data.numberOfTasksTotal}}</td>

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

@@ -420,12 +420,12 @@ export class DashboardAnalysisComponent implements OnInit {
    
   exportLoading=false;
   export(){
-    let month=this.year.substring(2,4)+this.month;
-    this.fbsWorkshopDispatchListService.export(month).then((response)=>{
-      let list=[];
-      list=response.result
+    // let month=this.year.substring(2,4)+this.month;
+    // this.fbsWorkshopDispatchListService.export(month).then((response)=>{
+    //   let list=[];
+    //   list=response.result
 
-    this.exportLoading=true;
+    // this.exportLoading=true;
     let data = [];
     let title = [
       ['项目名称'], // 项目名称
@@ -438,7 +438,7 @@ export class DashboardAnalysisComponent implements OnInit {
       ['累计完成工时'], // 累计完成工时
     ];
     data.push(title);
-    list.forEach(element => {
+    this.listOfData.forEach(element => {
       let row=[];
       row.push(element.projectName)
       row.push(element.productionOrderNumberName)
@@ -462,7 +462,9 @@ export class DashboardAnalysisComponent implements OnInit {
       ['其他总工时'],
       [this.AbnormalWorkingHoursTotal.train],
       ['异常总工时统计'],
-      [this.AbnormalWorkingHoursTotal.abnormalWorkingHours]
+      [this.AbnormalWorkingHoursTotal.abnormalWorkingHours],
+      ['仓库总工时统计'],
+      [this.AbnormalWorkingHoursTotal.warehouse]
     ];
     data.push(efficiencyTotal);
     // 导出
@@ -475,8 +477,8 @@ export class DashboardAnalysisComponent implements OnInit {
       ],
       filename: '生产订单汇总导出.xlsx',
     });
-    this.exportLoading=false;
-    })
+    // this.exportLoading=false;
+    // })
   }
   
 }

src/app/routes/fbs-scan-code/list/list.component.html

@@ -92,6 +92,18 @@
         <td nzAlign="center">{{item.workingHours}}</td>
         <td nzAlign="center">{{item.qualifiedNumber}}</td>
       </tr>
+      <tr style="font-weight:bolder">
+        <td>总计</td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td ></td>
+        <td></td>
+        <td ></td>
+        <td></td>
+        <td nzAlign="center">{{totalList.workingHoursTotal}}</td>
+        <td nzAlign="center">{{totalList.qualifiedNumberTotal}}</td>
+      </tr>
     </tbody>
   </nz-table>
 </nz-card>

src/app/routes/fbs-scan-code/list/list.component.ts

@@ -65,11 +65,36 @@ export class FbsScanCodeListComponent implements OnInit {
         //查询成功
         this.dataList = response.result.records; //表格数据
         this.page = response.result; //分页数据
+        this.getTotal();//查询总计
         this.isLoading = false;
+
       }
     });
   }
 
+  /**
+   * 初始化总计变量
+   */
+  totalList:any={};
+  initializationTotal(){
+    this.totalList={
+      workingHoursTotal:0,
+      qualifiedNumberTotal:0
+    }
+  }
+  /**
+   * 计算工时、数量总计
+   */
+  getTotal(){
+    this.initializationTotal();
+    this.dataList.forEach(element => {
+      this.totalList.workingHoursTotal+=Number(element.workingHours);
+      this.totalList.qualifiedNumberTotal+=Number(element.qualifiedNumber);
+    });
+    this.totalList.workingHoursTotal=this.totalList.workingHoursTotal.toFixed(1);
+    this.totalList.qualifiedNumberTotal=this.totalList.qualifiedNumberTotal.toFixed(1);
+  }
+
    /**
    * 初始化人员下拉数据集合
    */