统计优化2

src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.html

@@ -31,56 +31,58 @@
   <span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</span>
 	<span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
 </div>
-<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
-  <thead (nzSortChange)="sort($event)" nzSingleSort>
-    <tr>
-			<th nzWidth="9%" *ngIf="parent==1">父级科室(编码)</th>
-      <th nzWidth="9%">科室(编码)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
-			<th nzWidth="9%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr *ngFor="let data of listOfData">
-			<td *ngIf="parent==1">{{ data.parentName || '无' }}</td>
-      <td>{{ data.name }}</td>
-      <td>{{ data.totalCount }}</td>
-      <td>{{ data.totalGrade }}</td>
-			<td>{{ data.totalPrice }}</td>
-      <td>{{ data.response_time_num }}</td>
-      <td>{{ data.execution_time_num }}</td>
-      <td>{{ data.aveper }}</td>
-      <td>{{ data.total_time }}</td>
-      <td>{{ data.five_count }}</td>
-      <td>{{ data.special_close }}</td>
-    </tr>
-  </tbody>
-  <ng-template #footerTpl>
-    <table class="footTable">
-      <tr *ngFor="let data of listOfDataEnd">
-				<td style="width: 9%" *ngIf="parent==1">{{ data.parentName }}</td>
-				<td style="width: 9%" *ngIf="parent==0">{{ data.name }}</td>
-				<td style="width: 9%" *ngIf="parent==1"></td>
-        <td style="width: 9%">{{ data.totalCount }}</td>
-        <td style="width: 9%">{{ data.totalGrade }}</td>
-				<td style="width: 9%">{{ data.totalPrice }}</td>
-        <td style="width: 9%">{{ data.response_time_num }}</td>
-        <td style="width: 9%">{{ data.execution_time_num }}</td>
-        <td style="width: 9%">{{ data.aveper }}</td>
-        <td style="width: 9%">{{ data.total_time }}</td>
-        <td style="width: 9%">{{ data.five_count }}</td>
-        <td style="width: 9%">{{ data.special_close }}</td>
-      </tr>
-    </table>
-  </ng-template>
-</nz-table>
+<div class="tableWrap">
+	<nz-table class="table" [ngStyle]="{ width: widthValue + 'px' }" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzWidthConfig]="widthConfig" [nzFooter]="footerTpl">
+		<thead (nzSortChange)="sort($event)" nzSingleSort>
+			<tr>
+				<th rowspan="2" *ngIf="parent==1">父级科室(编码)</th>
+				<th rowspan="2">科室(编码)</th>
+				<th rowspan="2" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+				<th rowspan="2" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+				<th rowspan="2" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
+				<th rowspan="2" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+				<th rowspan="2" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
+				<th rowspan="2" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
+				<th rowspan="2" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+				<th rowspan="2" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+				<th rowspan="2" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr *ngFor="let data of listOfData">
+				<td class="width150" *ngIf="parent==1">{{ data.parentName || '无' }}</td>
+				<td>{{ data.name }}</td>
+				<td>{{ data.totalCount }}</td>
+				<td>{{ data.totalGrade }}</td>
+				<td>{{ data.totalPrice }}</td>
+				<td>{{ data.response_time_num }}</td>
+				<td>{{ data.execution_time_num }}</td>
+				<td>{{ data.aveper }}</td>
+				<td>{{ data.total_time }}</td>
+				<td>{{ data.five_count }}</td>
+				<td>{{ data.special_close }}</td>
+			</tr>
+		</tbody>
+		<ng-template #footerTpl>
+			<table class="footTable">
+				<tr *ngFor="let data of listOfDataEnd">
+					<td class="width150" *ngIf="parent==1">{{ data.parentName }}</td>
+					<td class="width150" *ngIf="parent==0">{{ data.name }}</td>
+					<td class="width150" *ngIf="parent==1"></td>
+					<td>{{ data.totalCount }}</td>
+					<td>{{ data.totalGrade }}</td>
+					<td>{{ data.totalPrice }}</td>
+					<td>{{ data.response_time_num }}</td>
+					<td>{{ data.execution_time_num }}</td>
+					<td>{{ data.aveper }}</td>
+					<td>{{ data.total_time }}</td>
+					<td>{{ data.five_count }}</td>
+					<td>{{ data.special_close }}</td>
+				</tr>
+			</table>
+		</ng-template>
+	</nz-table>
+</div>
 <div class="pagination">
   <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
   <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>

src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.less

@@ -53,7 +53,22 @@
   .table{
     margin: 0 8px;
   }
-
+	
+	.tableWrap{
+	  margin: 0 8px;
+	  overflow-x: auto;
+	  .footTable, tbody{
+	    td{
+	      width: 100px;
+	      max-width: 100px;
+	      &.width150{
+	        width: 150px;
+	        max-width: 150px;
+	      }
+	    }
+	  }
+	}
+	
   .moreFilter{
     margin-bottom: 16px;
     span{

src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.ts

@@ -113,6 +113,8 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 
   // 表格数据
   loading1 = false;
+	widthValue:any;
+	widthConfig:any = [];
   getList(num?: number, field?: string, sort?: string) {
     if (num !== undefined) {
       this.pageIndex = num;
@@ -134,6 +136,13 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
+		if(this.parent==1){
+			this.widthConfig = new Array(11).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });;
+			this.widthValue = 11 * 100 + 300 * 1 + 20
+		}else{
+			this.widthConfig = new Array(10).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });;
+			this.widthValue = 10 * 100 + 162 * 1 + 20
+		}
     this.loading1 = true;
     this.mainService
       .postCustom("itsm/report", "deptTransOrderQc", postData)

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.html

@@ -34,16 +34,16 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-			<th nzWidth="10%" *ngIf="parent==1">父级科室(编码)</th>
-      <th nzWidth="10%">科室(编码)</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="evaCount" [(nzSort)]="sortCurrent.evaCount">评价总工单数</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="eva1" [(nzSort)]="sortCurrent.eva1">一星评价数</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="eva2" [(nzSort)]="sortCurrent.eva2">二星评价数</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="eva3" [(nzSort)]="sortCurrent.eva3">三星评价数</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="eva4" [(nzSort)]="sortCurrent.eva4">四星评价数</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="eva5" [(nzSort)]="sortCurrent.eva5">五星评价数</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="avgCount" [(nzSort)]="sortCurrent.avgCount">平均总星级</th>
+			<th [nzWidth]="widthStyle" *ngIf="parent==1">父级科室(编码)</th>
+      <th [nzWidth]="widthStyle">科室(编码)</th>
+      <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+      <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="evaCount" [(nzSort)]="sortCurrent.evaCount">评价总工单数</th>
+      <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="eva1" [(nzSort)]="sortCurrent.eva1">一星评价数</th>
+      <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="eva2" [(nzSort)]="sortCurrent.eva2">二星评价数</th>
+      <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="eva3" [(nzSort)]="sortCurrent.eva3">三星评价数</th>
+      <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="eva4" [(nzSort)]="sortCurrent.eva4">四星评价数</th>
+      <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="eva5" [(nzSort)]="sortCurrent.eva5">五星评价数</th>
+      <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="avgCount" [(nzSort)]="sortCurrent.avgCount">平均总星级</th>
     </tr>
   </thead>
   <tbody>
@@ -63,17 +63,17 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-				<td style="width: 10%" *ngIf="parent==1">{{ data.parentName }}</td>
-				<td style="width: 10%" *ngIf="parent==0">{{ data.name }}</td>
-				<td style="width: 10%" *ngIf="parent==1"></td>
-        <td style="width: 10%">{{ data.totalCount }}</td>
-        <td style="width: 10%">{{ data.evaCount }}</td>
-        <td style="width: 10%">{{ data.eva1 }}</td>
-        <td style="width: 10%">{{ data.eva2 }}</td>
-        <td style="width: 10%">{{ data.eva3 }}</td>
-        <td style="width: 10%">{{ data.eva4 }}</td>
-        <td style="width: 10%">{{ data.eva5 }}</td>
-        <td style="width: 10%">{{ data.avgCount }}</td>
+				<td [ngStyle]="{width: widthStyle}" *ngIf="parent==1">{{ data.parentName }}</td>
+				<td [ngStyle]="{width: widthStyle}" *ngIf="parent==0">{{ data.name }}</td>
+				<td [ngStyle]="{width: widthStyle}" *ngIf="parent==1"></td>
+        <td [ngStyle]="{width: widthThStyle}">{{ data.totalCount }}</td>
+        <td [ngStyle]="{width: widthThStyle}">{{ data.evaCount }}</td>
+        <td [ngStyle]="{width: widthThStyle}">{{ data.eva1 }}</td>
+        <td [ngStyle]="{width: widthThStyle}">{{ data.eva2 }}</td>
+        <td [ngStyle]="{width: widthThStyle}">{{ data.eva3 }}</td>
+        <td [ngStyle]="{width: widthThStyle}">{{ data.eva4 }}</td>
+        <td [ngStyle]="{width: widthThStyle}">{{ data.eva5 }}</td>
+        <td [ngStyle]="{width: widthThStyle}">{{ data.avgCount }}</td>
       </tr>
     </table>
   </ng-template>

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.less

@@ -53,7 +53,22 @@
   .table{
     margin: 0 8px;
   }
-
+	
+	.tableWrap{
+	  margin: 0 8px;
+	  overflow-x: auto;
+	  .footTable, tbody{
+	    td{
+	      width: 100px;
+	      max-width: 100px;
+	      &.width150{
+	        width: 150px;
+	        max-width: 150px;
+	      }
+	    }
+	  }
+	}
+	
   .moreFilter{
     margin-bottom: 16px;
     span{

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.ts

@@ -113,6 +113,8 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
   // 表格数据
   loading1 = false;
+	widthStyle:any;
+	widthThStyle:any;
   getList(num?: number, field?: string, sort?: string) {
     if (num !== undefined) {
       this.pageIndex = num;
@@ -134,6 +136,13 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
+		if(this.parent==1){
+			this.widthThStyle = '9%'
+			this.widthStyle = '14%'
+		}else{
+			this.widthThStyle = '10%'
+			this.widthStyle = '20%'
+		}
     this.loading1 = true;
     this.mainService
       .postCustom("itsm/report", "deptDegreeTransOrder", postData)

src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.ts

@@ -148,7 +148,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 		}else{
 			this.widthConfig = new Array(10).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });;
 			this.widthStyle = '20%'
-			this.widthValue = 10 * 100 + 149 * 1 + 20
+			this.widthValue = 10 * 100 + 162 * 1 + 20
 		}
     this.loading1 = true;
     this.mainService