统计优化3

src/app/views/new-statistics/components/query-range/query-range.component.html

@@ -42,7 +42,7 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
-			<!-- 	<nz-form-item class="mb0">
+				<nz-form-item class="mb0">
 				  <nz-form-label [nzSpan]="7" nzRequired nzFor="parent">是否显示父级科室</nz-form-label>
 				  <nz-form-control [nzSpan]="15" nzErrorTip="请选择是否显示父级科室!">
 				    <nz-radio-group formControlName="parent">
@@ -50,7 +50,7 @@
 				      <label nz-radio [nzValue]="0">否</label>
 				    </nz-radio-group>
 				  </nz-form-control>
-				</nz-form-item> -->
+				</nz-form-item>
       </form>
     </div>
     <div class="display_flex justify-content_flex-center">

src/app/views/new-statistics/components/query-range/query-range.component.ts

@@ -40,7 +40,7 @@ export class QueryRangeComponent implements OnInit {
       hospital: [(this.hospital && (this.queryType == 2 || this.queryType == 3)) ? this.hospital.id : null],
       duty: [(this.duty && this.queryType == 3) ? this.duty.id : null],
       dutyOne: [(this.duty && this.queryType == 4) ? this.duty.id : null],
-			// parent :[this.parent?1:0, [Validators.required]]
+			parent :[this.parent?1:0, [Validators.required]]
     });
   }
   // 表单提交
@@ -53,7 +53,7 @@ export class QueryRangeComponent implements OnInit {
     let queryType = this.validateForm.value.queryType;
     let hospital;
     let duty;
-		// let parent = this.validateForm.value.parent;
+		let parent = this.validateForm.value.parent;
     switch (queryType) {
       case 1:
         break;
@@ -69,7 +69,7 @@ export class QueryRangeComponent implements OnInit {
         duty = this.dutyOneList.find(v => v.id == this.validateForm.value.dutyOne);
         break;
     }
-    this.submitQueryRange.emit({queryType, hospital, duty});
+    this.submitQueryRange.emit({queryType, hospital, duty, parent});
     this.hideModal();
   }
 

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

@@ -32,25 +32,25 @@
 	<span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
 </div>
 <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">
+	<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 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>
+				<th [nzWidth]="widthStyle" *ngIf="parent==1">父级科室(编码)</th>
+				<th [nzWidth]="widthStyle">科室(编码)</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+				<th [nzWidth]="widthStyle" 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 *ngIf="parent==1">{{ data.parentName || '无' }}</td>
 				<td>{{ data.name }}</td>
 				<td>{{ data.totalCount }}</td>
 				<td>{{ data.totalGrade }}</td>
@@ -66,18 +66,18 @@
 		<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>
+					<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:widthStyle}">{{ data.totalCount }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.totalGrade }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.totalPrice }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.response_time_num }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.execution_time_num }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.aveper }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.total_time }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.five_count }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.special_close }}</td>
 				</tr>
 			</table>
 		</ng-template>

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

@@ -115,6 +115,7 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
   loading1 = false;
 	widthValue:any;
 	widthConfig:any = [];
+	widthStyle:any;
   getList(num?: number, field?: string, sort?: string) {
     if (num !== undefined) {
       this.pageIndex = num;
@@ -139,9 +140,11 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 		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
+			this.widthStyle = '9%'
 		}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.widthStyle = '10%'
 		}
     this.loading1 = true;
     this.mainService

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

@@ -159,6 +159,7 @@
 						display: flex;
 						height: 45px;
 						border-bottom: 1px solid #D9D9D9;
+						background: #FAFAFA;
 						.table-td{
 							line-height: 45px;
 							text-align: center;

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

@@ -35,26 +35,26 @@
 	<span>{{fieldConfig.fields.deptTypeDTO?.name}}</span>
 </div>
 <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">
+	<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 rowspan="2" *ngIf="parent==1">父级科室(编码)</th>
-				<th rowspan="2">科室名称(编码)</th>
-				<th rowspan="2" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-				<th rowspan="2" nzShowSort nzSortKey="degreeCount" [(nzSort)]="sortCurrent.degreeCount">评价工单数</th>
-				<th rowspan="2" nzShowSort nzSortKey="oneStar" [(nzSort)]="sortCurrent.oneStar">一星</th>
-				<th rowspan="2" nzShowSort nzSortKey="twoStar" [(nzSort)]="sortCurrent.twoStar">二星</th>
-				<th rowspan="2" nzShowSort nzSortKey="threeStar" [(nzSort)]="sortCurrent.threeStar">三星</th>
-				<th rowspan="2" nzShowSort nzSortKey="fourStar" [(nzSort)]="sortCurrent.fourStar">四星</th>
-				<th rowspan="2" nzShowSort nzSortKey="fiveStar" [(nzSort)]="sortCurrent.fiveStar">五星</th>
-				<th rowspan="2" nzShowSort nzSortKey="totalStar" [(nzSort)]="sortCurrent.totalStar">评价总星数</th>
-				<th rowspan="2" nzShowSort nzSortKey="avgStar" [(nzSort)]="sortCurrent.avgStar">平均总星数</th>
+				<th [nzWidth]="widthStyle" *ngIf="parent==1">父级科室(编码)</th>
+				<th [nzWidth]="widthStyle">科室名称(编码)</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="degreeCount" [(nzSort)]="sortCurrent.degreeCount">评价工单数</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="oneStar" [(nzSort)]="sortCurrent.oneStar">一星</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="twoStar" [(nzSort)]="sortCurrent.twoStar">二星</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="threeStar" [(nzSort)]="sortCurrent.threeStar">三星</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="fourStar" [(nzSort)]="sortCurrent.fourStar">四星</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="fiveStar" [(nzSort)]="sortCurrent.fiveStar">五星</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="totalStar" [(nzSort)]="sortCurrent.totalStar">评价总星数</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="avgStar" [(nzSort)]="sortCurrent.avgStar">平均总星数</th>
 			</tr>
 		</thead>
 		<tbody>
 			<tr *ngFor="let data of listOfData">
-				<td class="width150" *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
-				<td class="width150">{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
+				<td *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
+				<td>{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
 				<td>{{ data.sum }}</td>
 				<td>{{ data.degreeCount }}</td>
 				<td>{{ data.oneStar }}</td>
@@ -69,18 +69,18 @@
 		<ng-template #footerTpl>
 			<table class="footTable">
 				<tr *ngFor="let data of listOfDataEnd">
-					<td class="width150" *ngIf="parent==1">{{ data.parentCode }}</td>
-					<td class="width150" *ngIf="parent==0">{{ data.deptCode }}</td>
-					<td class="width150" *ngIf="parent==1"></td>
-					<td>{{ data.sum }}</td>
-					<td>{{ data.degreeCount }}</td>
-					<td>{{ data.oneStar }}</td>
-					<td>{{ data.twoStar }}</td>
-					<td>{{ data.threeStar }}</td>
-					<td>{{ data.fourStar }}</td>
-					<td>{{ data.fiveStar }}</td>
-					<td>{{ data.totalStar }}</td>
-					<td>{{ data.avgStar }}</td>
+					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==1">{{ data.parentCode }}</td>
+					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==0">{{ data.deptCode }}</td>
+					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==1"></td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.sum }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.degreeCount }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.oneStar }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.twoStar }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.threeStar }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.fourStar }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.fiveStar }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.totalStar }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.avgStar }}</td>
 				</tr>
 			</table>
 		</ng-template>

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

@@ -55,7 +55,7 @@
   }
 	
 	.tableWrap{
-	  margin: 0 8px;
+	  // margin: 0 8px;
 	  overflow-x: auto;
 	  .footTable, tbody{
 	    td{

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

@@ -143,12 +143,12 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
     }
 		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.widthStyle = '10%'
-			this.widthValue = 11 * 100 + 300 * 1 + 20
+			this.widthStyle = '9%'
+			this.widthValue = 12 * 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.widthStyle = '20%'
-			this.widthValue = 10 * 100 + 162 * 1 + 20
+			this.widthStyle = '10%'
+			this.widthValue = 11 * 100 + 150 * 1 + 20
 		}
     this.loading1 = true;
     this.mainService
@@ -205,7 +205,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
-      deptTypeId: this.fieldConfig.deptTypeId || undefined,
+      deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
       repairDeptId: this.deptId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,

src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.html

@@ -35,27 +35,27 @@
 	<span>{{fieldConfig.fields.deptTypeDTO?.name}}</span>
 </div>
 <div class="tableWrap">
-	<nz-table class="table" [ngStyle]="{ width: widthValue + 'px' }" accesskey=""[nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzWidthConfig]="widthConfig" [nzFooter]="footerTpl">
+	<nz-table class="table" accesskey=""[nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
 		<thead (nzSortChange)="sort($event)" nzSingleSort>
 			<tr>
-				<th rowspan="2" *ngIf="parent==1">父级科室(编码)</th>
-				<th rowspan="2">科室名称(编码)</th>
-				<th rowspan="2" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-				<th rowspan="2" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
-				<th rowspan="2" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
-				<th rowspan="2" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
-				<th rowspan="2" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
-				<th rowspan="2" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
-				<th rowspan="2" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">工时费用(元)</th>
-				<th rowspan="2" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用(元)</th>
-				<th rowspan="2" nzShowSort nzSortKey="negativeNum" [(nzSort)]="sortCurrent.negativeNum">差评单数</th>
-				<th rowspan="2" nzShowSort nzSortKey="favorableRate" [(nzSort)]="sortCurrent.favorableRate">好评率</th>
+				<th [nzWidth]="widthStyle" *ngIf="parent==1">父级科室(编码)</th>
+				<th [nzWidth]="widthStyle">科室名称(编码)</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">工时费用(元)</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用(元)</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="negativeNum" [(nzSort)]="sortCurrent.negativeNum">差评单数</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="favorableRate" [(nzSort)]="sortCurrent.favorableRate">好评率</th>
 			</tr>
 		</thead>
 		<tbody>
 			<tr *ngFor="let data of listOfData">
-				<td class="width150" *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
-				<td class="width150">{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
+				<td *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
+				<td>{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
 				<td>{{ data.sum }}</td>
 				<td>{{ data.avgResponseTime }}</td>
 				<td>{{ data.avgResolvedTime }}</td>
@@ -71,19 +71,19 @@
 		<ng-template #footerTpl>
 			<table class="footTable">
 				<tr *ngFor="let data of listOfDataEnd">
-					<td class="width150" *ngIf="parent==1">{{ data.parentCode }}</td>
-					<td class="width150" *ngIf="parent==0">{{ data.deptCode}}</td>
-					<td class="width150" *ngIf="parent==1"></td>
-					<td>{{ data.sum }}</td>
-					<td>{{ data.avgResponseTime }}</td>
-					<td>{{ data.avgResolvedTime }}</td>
-					<td>{{ data.resolvedOverNum }}</td>
-					<td>{{ data.overTimeNum }}</td>
-					<td>{{ data.consumablePrice }}</td>
-					<td>{{ data.workHourPrice }}</td>
-					<td>{{ data.totalPrice }}</td>
-					<td>{{ data.negativeNum }}</td>
-					<td>{{ data.favorableRate }}</td>
+					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==1">{{ data.parentCode }}</td>
+					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==0">{{ data.deptCode}}</td>
+					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==1"></td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.sum }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.avgResponseTime }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.avgResolvedTime }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.resolvedOverNum }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.overTimeNum }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.consumablePrice }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.workHourPrice }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.totalPrice }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.negativeNum }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.favorableRate }}</td>
 				</tr>
 			</table>
 		</ng-template>

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

@@ -143,12 +143,12 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     }
 		if(this.parent==1){
 			this.widthConfig = new Array(12).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });;
-			this.widthStyle = '10%'
-			this.widthValue = 12 * 100 + 300 * 1 + 20
+			this.widthStyle = '8%'
+			this.widthValue = 1920
 		}else{
 			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.widthStyle = '20%'
-			this.widthValue = 11 * 100 + 149 * 1 + 20
+			this.widthStyle = '9%'
+			this.widthValue = 1920
 		}
     this.loading1 = true;
     this.mainService
@@ -205,7 +205,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
-      deptTypeId: this.fieldConfig.deptTypeId || undefined,
+			deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
 			repairDeptId: this.deptId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,

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

@@ -193,7 +193,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
 			hosId: this.hosId || undefined,
 			dutyId: this.dutyId || undefined,
 			parentDutyId: this.parentDutyId || undefined,
-			deptTypeId: this.fieldConfig.deptTypeId || undefined,
+			deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
 			repairDeptId: this.deptId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,

src/app/views/new-statistics/maintenance-statistics/synthesize-statistics/synthesize-statistics.component.less

@@ -133,6 +133,7 @@
 						display: flex;
 						height: 45px;
 						border-bottom: 1px solid #D9D9D9;
+						background: #FAFAFA;
 						.table-td{
 							line-height: 45px;
 							text-align: center;