11

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

@@ -105,15 +105,15 @@
           <th nzLeft="265px" nzWidth="120px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>物料编码</strong></th>
           <th nzLeft="383px" nzWidth="200px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>物料名称</strong></th> -->
           
-          <th rowSpan="2"  nzWidth="60px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>序号</strong></th>
-          <th rowSpan="2" nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>项目名称</strong></th>
-          <th rowSpan="2" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>生产订单号</strong></th>
-          <th rowSpan="2" nzWidth="120px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>物料编码</strong></th>
-          <th rowSpan="2" nzWidth="200px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>物料名称</strong></th>
-          <th rowSpan="2" nzWidth="80px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>月度计划</strong></th>
-          <th rowSpan="2" nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>标准总工时</strong></th>
-          <th rowSpan="2" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>累计完成数量</strong></th>
-          <th rowSpan="2" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>累计完成工时</strong></th>
+          <th nzLeft="0px" rowSpan="2"  nzWidth="60px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>序号</strong></th>
+          <th nzLeft="58px" rowSpan="2" nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>项目名称</strong></th>
+          <th nzLeft="157px" rowSpan="2" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>生产订单号</strong></th>
+          <th nzLeft="265px" rowSpan="2" nzWidth="120px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>物料编码</strong></th>
+          <th nzLeft="383px" rowSpan="2" nzWidth="200px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>物料名称</strong></th>
+          <th nzLeft="580px" rowSpan="2" nzWidth="80px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>月度计划</strong></th>
+          <th nzLeft="659px" rowSpan="2" nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>标准总工时</strong></th>
+          <th nzLeft="758px" rowSpan="2" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>累计完成数量</strong></th>
+          <th nzLeft="867px" rowSpan="2" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>累计完成工时</strong></th>
           <ng-container *ngFor="let date of dateList">
             <th nzWidth="120px" nzAlign="center"><strong>当日计划数量</strong></th>
             <th nzWidth="120px" nzAlign="center"><strong>当日完成数量</strong></th>
@@ -137,15 +137,15 @@
         <tr *ngFor="let data of columnTable.data;let i = index">
           <ng-container *ngIf="data.projectName!=='统计'">
           <!-- *ngIf="data.mergeLines!=0" [attr.rowSpan]="data.mergeLines" -->
-          <td nzAlign="center"  *ngIf="data.mergeLines!=0" [attr.rowSpan]="data.mergeLines">{{ data.sort }}</td>
-          <td  *ngIf="data.mergeLines!=0" [attr.rowSpan]="data.mergeLines">{{ data.projectName }}</td>
-          <td >{{ data.productionOrderNumberName }}</td>
-          <td >{{data.productId}}</td>
-          <td >{{data.product}}</td>
-          <td nzAlign="center">{{data.numberOfTasksTotal}}</td>
-          <td nzAlign="center">{{data.standardWorkingHoursTotal}}</td>
-          <td nzAlign="center">{{data.quantityCompletedTotal}}</td>
-          <td nzAlign="center">{{data.manHoursCompletedTotal}}</td>
+          <td nzLeft="0px" nzAlign="center"  *ngIf="data.mergeLines!=0" [attr.rowSpan]="data.mergeLines">{{ data.sort }}</td>
+          <td nzLeft="58px"  *ngIf="data.mergeLines!=0" [attr.rowSpan]="data.mergeLines">{{ data.projectName }}</td>
+          <td nzLeft="157px" >{{ data.productionOrderNumberName }}</td>
+          <td nzLeft="265px">{{data.productId}}</td>
+          <td nzLeft="383px">{{data.product}}</td>
+          <td nzLeft="580px" nzAlign="center">{{data.numberOfTasksTotal}}</td>
+          <td nzLeft="659px" nzAlign="center">{{data.standardWorkingHoursTotal}}</td>
+          <td nzLeft="758px" nzAlign="center">{{data.quantityCompletedTotal}}</td>
+          <td nzLeft="867px" nzAlign="center">{{data.manHoursCompletedTotal}}</td>
           <ng-container *ngFor="let dateChild of data.fbsWorkshopDispatchListList">
             <td nzAlign="center">{{dateChild.numberOfTasks}}</td>
             <td nzAlign="center">{{dateChild.qualifiedNumber}}</td>
@@ -165,15 +165,15 @@
         <!-- 统计 -->
         <tr style="background-color:rgb(223, 223, 219)" *ngFor="let data of columnTable.data;let i = index">
           <ng-container *ngIf="data.projectName==='统计'">
-          <td  style="background-color:rgb(223, 223, 219)"></td>
-          <td  style="background-color:rgb(223, 223, 219);font-weight:bolder" nzAlign="center">统计</td>
-          <td  style="background-color:rgb(223, 223, 219)"></td>
-          <td ></td>
-          <td ></td>
-          <td nzAlign="center">{{data.numberOfTasksTotal}}</td>
-          <td nzAlign="center">{{data.standardWorkingHoursTotal}}</td>
-          <td nzAlign="center">{{data.quantityCompletedTotal}}</td>
-          <td nzAlign="center">{{data.manHoursCompletedTotal}}</td>
+          <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)"></td>
+          <td nzLeft="265px"></td>
+          <td  nzLeft="383px"></td>
+          <td nzLeft="580px" nzAlign="center">{{data.numberOfTasksTotal}}</td>
+          <td nzLeft="659px" nzAlign="center">{{data.standardWorkingHoursTotal}}</td>
+          <td nzLeft="758px" nzAlign="center">{{data.quantityCompletedTotal}}</td>
+          <td nzLeft="867px" nzAlign="center">{{data.manHoursCompletedTotal}}</td>
           <ng-container *ngFor="let dateChild of data.fbsWorkshopDispatchListList">
             <td nzAlign="center">{{dateChild.numberOfTasks}}</td>
             <td nzAlign="center">{{dateChild.qualifiedNumber}}</td>
@@ -195,7 +195,7 @@
       <!-- 异常工时 -->
       <tbody>
         <tr>
-          <td colspan="5" rowSpan="8"></td>
+          <td nzLeft="0px" colspan="5" rowSpan="8"></td>
           <!-- <td ></td>
           <td ></td>
           <td ></td>
@@ -204,9 +204,9 @@
           <td>1.95%</td>
           <td>月生产效率</td>
           <td>根据生产计划进度。实时变化</td> -->
-          <td class="bolder">出勤总工时</td>
-          <td nzAlign="center">{{AbnormalWorkingHoursTotal.attendanceHours}}</td>
-          <td colSpan="2" nzAlign="right" class="bolder">出勤情况</td>
+          <td nzLeft="580px" class="bolder">出勤总工时</td>
+          <td nzLeft="659px" nzAlign="center">{{AbnormalWorkingHoursTotal.attendanceHours}}</td>
+          <td  nzLeft="758px" colSpan="2" nzAlign="right" class="bolder">出勤情况</td>
           <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
             <td >应到人数</td>
             <td nzAlign="center">{{abnormalWorkingHours.numberOfPeopleToArrive}}</td>
@@ -222,9 +222,9 @@
           <td ></td>
           <td ></td>
           <td ></td> -->
-          <td class="bolder">加班总工时</td>
-          <td nzAlign="center">{{AbnormalWorkingHoursTotal.overtimeHours}}</td>
-          <td colSpan="2" nzAlign="right" class="bolder">加班记录</td>
+          <td nzLeft="580px" class="bolder">加班总工时</td>
+          <td nzLeft="659px" nzAlign="center">{{AbnormalWorkingHoursTotal.overtimeHours}}</td>
+          <td nzLeft="758px" colSpan="2" nzAlign="right" class="bolder">加班记录</td>
           <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
             <td>加班工时</td>
             <td nzAlign="center">{{abnormalWorkingHours.overtimeHours}}</td>
@@ -243,9 +243,9 @@
           <td nzLeft="157px" rowSpan="2"></td>
           <td nzLeft="265px" rowSpan="2"></td>
           <td nzLeft="383px" rowSpan="2"></td> -->
-          <td rowSpan="2" class="bolder">其他总工时</td>
-          <td rowSpan="2" nzAlign="center">{{AbnormalWorkingHoursTotal.train}}</td>
-          <td colSpan="2" rowSpan="2" nzAlign="right" class="bolder">其他工时统计</td>
+          <td nzLeft="580px" rowSpan="2" class="bolder">其他总工时</td>
+          <td nzLeft="659px" rowSpan="2" nzAlign="center">{{AbnormalWorkingHoursTotal.train}}</td>
+          <td nzLeft="758px" colSpan="2" rowSpan="2" nzAlign="right" class="bolder">其他工时统计</td>
           <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
             <td>培训</td>
             <td nzAlign="center">{{abnormalWorkingHours.train}}</td>
@@ -276,9 +276,9 @@
           <td nzLeft="157px" rowSpan="3"></td>
           <td nzLeft="265px" rowSpan="3"></td>
           <td nzLeft="383px" rowSpan="3"></td> -->
-          <td rowSpan="3" class="bolder">异常总工时统计</td>
-          <td rowSpan="3" nzAlign="center">{{AbnormalWorkingHoursTotal.abnormalWorkingHours}}</td>
-          <td colSpan="2" rowSpan="3" nzAlign="right" class="bolder">异常工时统计</td>
+          <td nzLeft="580px" rowSpan="3" class="bolder">异常总工时统计</td>
+          <td nzLeft="659px" rowSpan="3" nzAlign="center">{{AbnormalWorkingHoursTotal.abnormalWorkingHours}}</td>
+          <td nzLeft="758px" colSpan="2" rowSpan="3" nzAlign="right" class="bolder">异常工时统计</td>
           <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
             <td>质量</td>
             <td nzAlign="center">{{abnormalWorkingHours.quality}}</td>
@@ -315,7 +315,7 @@
           <td ></td>
           <td ></td>
           <td ></td> -->
-          <td colSpan="4" class="bolder">异常原因描述</td>
+          <td nzLeft="580px" colSpan="4" class="bolder">异常原因描述</td>
           <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
             <td colSpan="6">
               <ng-container *ngFor="let describe of abnormalWorkingHours.fbsAbnormalWorkingHoursDescribeList">