Merge branch 'develop' of http://git.dashitech.com/seimin/zy-pc into develop

src/app/services/main.service.ts

@@ -1088,4 +1088,11 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
+	// 综合统计
+	getReportData(data) {
+	  return this.http.post(host.host + `/itsm/report/index`, data, {
+	    headers: this.headers,
+	  });
+	}
+	
 }

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

@@ -58,6 +58,9 @@
   .content{
     margin-top: 8px;
     display: flex;
+    flex: 1;
+    min-height: 0;
+		overflow-x: hidden;
     height: 100%;
     .secondMenu{
       width: 175px;

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

@@ -1,49 +1,166 @@
-<div class="searchDataWrap">
-  <div class="searchData">
-    <div class="searchDataItem">
-      <span class="label">建单时间</span>：
-      <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]="false" (ngModelChange)="changeDate($event)" (nzOnCalendarChange)="onCalendarChangeDate($event)">
-      </nz-range-picker>
-    </div>
-  </div>
-  <div class="operation">
-    <button nz-button class="btn default" (click)="search(1)">搜索</button>
-    <button nz-button class="btn default ml8" (click)="excelExport()">导出</button>
-    <button nz-button class="btn default ml8" (click)="reset()">重置</button>
-  </div>
-</div>
-<nz-table [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1">
-  <thead (nzSortChange)="sort($event)" nzSingleSort>
-    <tr>
-      <th nzWidth="10%" nzShowSort nzSortKey="startDate" [(nzSort)]="sortCurrent.startDate">时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">工时费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="negativeNum" [(nzSort)]="sortCurrent.negativeNum">差评单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="favorableRate" [(nzSort)]="sortCurrent.favorableRate">好评率</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr *ngFor="let data of listOfData; let index = index">
-      <td>{{ data.startDate }}</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>
-    </tr>
-  </tbody>
-</nz-table>
-<div>
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+<div class="synthesize-box" *ngIf="!isLoading">
+	<div class="searchDataWrap">
+		<div class="searchData">
+			<div class="searchDataItem">
+				<span class="label">选择日期</span>：
+				<nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]="false" (ngModelChange)="changeDate($event)" (nzOnCalendarChange)="onCalendarChangeDate($event)">
+				</nz-range-picker>
+			</div>
+		</div>
+		<div class="operation">
+			<button nz-button class="btn default" (click)="search()">搜索</button>
+			<button nz-button class="btn default ml8" (click)="search()">重置</button>
+		</div>
+	</div>
+	<div class="top1-statistics">
+		<div class="top-list">
+			<div class="special-box">
+				<div class="num">{{workData.gd_total}}</div>
+				<div class="describe">工单总数</div>
+			</div>
+			<div class="special-box-right">
+				<div class="sign-describe">已完成: <span class="sign-num">{{workData.gd_close}}</span></div>
+				<div class="sign-describe">待接单: <span class="sign-num">{{workData.gd_todo}}</span></div>
+				<div class="sign-describe">处理中: <span class="sign-num">{{workData.gd_doing}}</span></div>
+			</div>
+		</div>
+		<div class="top-list">
+			<div class="special-box">
+				<div class="num">{{workData.sum_price}}</div>
+				<div class="describe">总费用 (元)</div>
+			</div>
+		</div>
+		<div class="top-list">
+			<div class="special-box">
+				<div class="num">{{workData.gd_postpone}}</div>
+				<div class="describe">挂起单数</div>
+			</div>
+		</div>
+		<div class="top-list">
+			<div class="special-box">
+				<div class="num">{{workData.gd_overtime}}</div>
+				<div class="describe">超时单数</div>
+			</div>
+		</div>
+		<div class="top-list">
+			<div class="special-box">
+				<div class="num">{{workData.gd_degree}}</div>
+				<div class="describe">差评单数</div>
+			</div>
+		</div>
+	</div>
+	<div class="top2-statistics">
+		<div class="statistics width-60 mar-right-8">
+			<div class="statistics-box">
+				<div class="sign-green"></div>
+				<div class="statistics-title">维修处理Top5</div>
+				<div class="statistics-select">
+					<div class="statistics-select-list" [ngClass]="{'activeClass': activeIndex == 0}" (click)="selectCheck(0)">维修人员</div>
+					<div class="statistics-select-list" [ngClass]="{'activeClass': activeIndex == 1}" (click)="selectCheck(1)">维修组</div>
+				</div>
+				<div class="more" (click)="toPath(1)">更多></div>
+			</div>
+			<div class="table">
+				<div class="td">
+					<div class="table-td">排名</div>
+					<div class="table-td" *ngIf="activeIndex==0">人员姓名</div>
+					<div class="table-td" *ngIf="activeIndex==1">维修组</div>
+					<div class="table-td">工单量</div>
+					<div class="table-td">平均接单时长</div>
+					<div class="table-td">平均处理时长</div>
+					<div class="table-td">超时单</div>
+				</div>
+				<div class="th" *ngFor="let item of maintainData; let index = index;">
+					<div class="table-list">
+						<img src="../../assets/images/top1.png" alt="" class="img" *ngIf="index==0">
+						<img src="../../assets/images/top2.png" alt="" class="img" *ngIf="index==1">
+						<img src="../../assets/images/top3.png" alt="" class="img" *ngIf="index==2">
+						<span *ngIf="index !=0 && index !=1 && index !=2">{{index+1}}</span>
+					</div>
+					<div class="table-list">{{item.name}}</div>
+					<div class="table-list">{{item.count}}</div>
+					<div class="table-list">{{item.avg_handle}}分</div>
+					<div class="table-list">{{item.avg_response}}分</div>
+					<div class="table-list">{{item.overtime}}</div>
+				</div>
+			</div>
+		</div>
+		<div class="statistics width-40">
+			<div class="statistics-box">
+				<div class="sign-green"></div>
+				<div class="statistics-title">报修来源</div>
+				<div class="more" (click)="toPath(2)">更多></div>
+			</div>
+			<div class="echarts-repairs">
+			  <div echarts class="echarts" [options]='repairsOptions'></div>
+			</div>
+		</div>
+	</div>
+	<div class="top2-statistics">
+		<div class="statistics width-49 mar-right-8">
+			<div class="statistics-box">
+				<div class="sign-green"></div>
+				<div class="statistics-title">一级故障现象Top5</div>
+				<div class="more" (click)="toPath(3)">更多></div>
+			</div>
+			<div class="echarts-repairs">
+				<div echarts class="echarts" [options]='malfunctionOptions'></div>
+			</div>
+		</div>
+		<div class="statistics width-50">
+			<div class="statistics-box">
+				<div class="sign-green"></div>
+				<div class="statistics-title">楼栋报修Top5</div>
+				<div class="more" (click)="toPath(4)">更多></div>
+			</div>
+			<div class="echarts-repairs">
+				<div echarts class="echarts" [options]='buildingOptions'></div>
+			</div>
+		</div>
+	</div>
+	<div class="top2-statistics">
+		<div class="statistics width-49 mar-right-8">
+			<div class="statistics-box">
+				<div class="sign-green"></div>
+				<div class="statistics-title">科室费用Top5</div>
+				<div class="more" (click)="toPath(5)">更多></div>
+			</div>
+			<div class="table">
+				<div class="td">
+					<div class="table-td-4">排名</div>
+					<div class="table-td-4">科室名称</div>
+					<div class="table-td-4">工单量</div>
+					<div class="table-td-4">总费用(元)</div>
+				</div>
+				<div class="th" *ngFor="let item of deptCostData; let index = index;">
+					<div class="table-list-4">{{index+1}}</div>
+					<div class="table-list-4">{{item.dept}}</div>
+					<div class="table-list-4">{{item.sum}}</div>
+					<div class="table-list-4">{{item.sum_price}}</div>
+				</div>
+			</div>
+		</div>
+		<div class="statistics width-50">
+			<div class="statistics-box">
+				<div class="sign-green"></div>
+				<div class="statistics-title">耗材Top5</div>
+				<div class="more" (click)="toPath(6)">更多></div>
+			</div>
+			<div class="table">
+				<div class="td">
+					<div class="table-td-4">排名</div>
+					<div class="table-td-4">耗材名称</div>
+					<div class="table-td-4">使用数量</div>
+					<div class="table-td-4">总费用(元)</div>
+				</div>
+				<div class="th" *ngFor="let item of consumableData; let index = index;">
+					<div class="table-list-4">{{index+1}}</div>
+					<div class="table-list-4">{{item.name}}({{item.spd_code}})</div>
+					<div class="table-list-4">{{item.sum}}</div>
+					<div class="table-list-4">{{item.sum_price}}</div>
+				</div>
+			</div>
+		</div>
+	</div>
 </div>
+<nz-spin nzSimple *ngIf="isLoading"></nz-spin>

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

@@ -5,17 +5,203 @@
   right: 0;
   bottom: 0;
   left: 0;
-  .searchDataWrap{
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    .searchData{
-      padding: 16px;
-      .searchDataItem{
-        .label{
-          font-size: 16px;
-        }
-      }
-    }
-  }
+	.synthesize-box{
+		background: #F0F2F5 !important;
+		height: calc((100vh - 92px));
+		overflow-y: auto;
+		overflow-x: hidden;
+		.searchDataWrap{
+		  display: flex;
+		  align-items: center;
+		  justify-content: space-between;
+			padding-right: 15px;
+			background: #fff;
+			margin-bottom: 8px;
+		  .searchData{
+		    padding: 16px;
+		    .searchDataItem{
+		      .label{
+		        font-size: 16px;
+		      }
+		    }
+		  }
+		}
+		.top1-statistics{
+			display: flex;
+			background: #fff;
+			padding: 10px 0;
+			margin-bottom: 8px;
+			.top-list{
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 20%;
+				border-right: 1px solid #D9D9D9;
+				&:last-child{
+					border-right:none;
+				}
+				.special-box{
+					text-align: center;
+					position: relative;
+					top: -5px;
+					.num{
+						font-size: 35px;
+						font-weight: 500;
+						color: #64BD7B;
+					}
+					.describe{
+						font-size: 14px;
+						color: #8F8F8F;
+					}
+				}
+				.special-box-right{
+					margin-left: 16px;
+					.sign-describe{
+						font-size: 12px;
+						color: #8F8F8F;
+						.sign-num{
+							font-size: 14px;
+							font-weight: 500;
+							color: #000;
+						}
+					}
+				}
+			}
+		}
+		.top2-statistics{
+			display: flex;
+			// flex-flow: row wrap;
+			// justify-content: space-between;
+			height: 310px;
+			margin-bottom: 8px;
+			.mar-right-8{
+				margin-right: 8px;
+			}
+			.statistics{
+				padding: 10px;
+				background: #fff;
+				.statistics-box{
+					height: 41px;
+					display: flex;
+					align-items: center;
+					position: relative;
+					.sign-green{
+						width: 6px;
+						height: 6px;
+						border-radius: 50%;
+						background: #64BD7B;
+						margin-right: 5px;
+					}
+					.statistics-title{
+						color: #000;
+						font-size: 16px;
+						font-weight: 500;
+						margin-right: 10px;
+					}
+					.statistics-select{
+						display: flex;
+						.statistics-select-list{
+							width: 58px;
+							height: 23px;
+							line-height: 23px;
+							text-align: center;
+							border-radius: 3px;
+							border: 1px solid #E2E2E2;
+							font-size: 12px;
+							margin-right: 3px;
+							cursor: pointer;
+						}
+						.activeClass{
+							color: #64BD7B !important;
+							border: 1px solid #64BD7B !important;
+							background: #E9F7E9 !important;
+						}
+					}
+					.more{
+						position: absolute;
+						right: 0;
+						cursor: pointer;
+					}
+				}
+				.table{
+					width: 100%;
+					.td{
+						display: flex;
+						height: 45px;
+						border-bottom: 1px solid #D9D9D9;
+						.table-td{
+							line-height: 45px;
+							text-align: center;
+							width: 16.66%;
+							color: #000;
+						}
+						.table-td-4{
+							line-height: 45px;
+							text-align: center;
+							width: 25%;
+							color: #000;
+						}
+					}
+					.th{
+						display: flex;
+						height: 40px;
+						border-bottom: 1px solid #D9D9D9;
+						.table-list{
+							line-height: 40px;
+							text-align: center;
+							width: 16.66%;
+							color: #8F8F8F;
+							.img{
+								width: 25px;
+							}
+						}
+						.table-list-4{
+							line-height: 40px;
+							text-align: center;
+							width: 25%;
+							color: #8F8F8F;
+						}
+					}
+				}
+			}
+			.width-60{
+				width: 60%;
+			}
+			.width-50{
+				width: calc((100% - 8px)/2);
+				background: #fff;
+				.echarts-repairs{
+					.echarts{
+						width: 100%;
+						height: 260px;
+					}
+				}
+			}
+			.width-49{
+				width: calc((100% - 8px)/2);
+				background: #fff;
+				.echarts-repairs{
+					.echarts{
+						width: 100%;
+						height: 260px;
+					}
+				}
+			}
+			.width-40{
+				width: 40%;
+				background: #fff;
+				.echarts-repairs{
+					.echarts{
+						width: 100%;
+						height: 260px;
+					}
+				}
+			}
+		}
+		.top3-statistics{
+			// display: flex;
+			// height: 310px;
+			margin-bottom: 8px;
+		}
+	}
 }

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

@@ -10,17 +10,298 @@ export class SynthesizeStatisticsComponent implements OnInit {
   constructor(
     private mainService: MainService,
   ) {}
-
+	
+	isLoading:Boolean = false;
+	workData:any = []; //工单统计
   listOfData: any[] = []; //表格数据
   pageIndex: number = 1; //表格当前页码
   pageSize: number = 10; //表格每页展示条数
   listLength: number = 10; //表格总数据量
-
+	activeIndex:any = 0;
+	maintainData:any = []; //维修处理数据
+	repairsOptions:any={} //报修来源 option
+	malfunctionOptions:any={} //一级故障 option
+	buildingOptions:any={} //楼栋报修 option
+	deptCostData:any = [
+		{
+			name:'王'
+		},
+		{
+			name:'王'
+		},
+		{
+			name:'王'
+		},
+		{
+			name:'王'
+		},
+		{
+			name:'王'
+		}
+	] //科室费用
+	consumableData:any = [
+		{
+			name:'王'
+		},
+		{
+			name:'王'
+		},
+		{
+			name:'王'
+		},
+		{
+			name:'王'
+		},
+		{
+			name:'王'
+		}
+	] //报修耗材
   ngOnInit() {
     this.initSessionData();
     this.search();
   }
-
+	
+	// 维修处理类型切换
+	selectCheck(type){
+		this.activeIndex = type
+		this.getMaintainData();
+	}
+	
+	// 报修来源
+	repairsChart() {
+		let postData:any = {
+		  startDate: this.dateRange[0],
+		  endDate: this.dateRange[1],
+			type: 'sourceTop5',
+		  hosId: this.hosId,
+		  dutyId: this.dutyId,
+		  parentDutyId: this.parentDutyId,
+		};
+		this.mainService
+		  .getReportData(postData)
+		  .subscribe((result:any) => {
+		    let datas = result.data.map(i=>{
+					return{
+						name:i.name,
+						value:i.sum
+					}
+				});
+				this.repairsOptions = {
+				  tooltip: {
+				    trigger: "item",
+				    formatter: "{b}: {c} ({d}%)",
+				  },
+				  legend: {
+				    data: datas,
+						left: 'left',
+				  },
+				  series: [
+				    {
+				      name: "",
+				      type: "pie",
+				      radius: ["30%", "50%"],
+				      data: datas,
+							emphasis: {
+								itemStyle: {
+									shadowBlur: 10,
+									shadowOffsetX: 0,
+									shadowColor: 'rgba(0, 0, 0, 0.5)'
+								}
+							},
+							label: {
+									show: true,
+									formatter: '{b}: {c} {d}%'  
+							},
+				      itemStyle: {
+				        normal: {
+				          //每根柱子颜色设置
+				          color: function (params) {
+				            let colorList = [
+				              "#33CC85",
+				              "#72C0DD",
+				              "#FAC958",
+											"#546FC6",
+				            ];
+				            return colorList[params.dataIndex];
+				          },
+				        },
+				      },
+				    },
+				  ],
+				};
+		  });
+	}
+	
+	// 一级故障
+	malfunctionChart(){
+		let postData:any = {
+		  startDate: this.dateRange[0],
+		  endDate: this.dateRange[1],
+			type: 'firstCategoryTop5',
+		  hosId: this.hosId,
+		  dutyId: this.dutyId,
+		  parentDutyId: this.parentDutyId,
+		};
+		this.mainService
+		  .getReportData(postData)
+		  .subscribe((result:any) => {
+		    let datas = []
+				let title = []
+				for(let i of result.data){
+					datas.push(i.sum)
+					title.push(i.category)
+				}
+				this.malfunctionOptions = {
+					tooltip: {
+					    trigger: 'axis',
+					    axisPointer: {
+					      type: 'shadow'
+					    }
+					  },
+					  grid: {
+					    left: '3%',
+					    right: '4%',
+					    bottom: '3%',
+					    containLabel: true
+					  },
+					  xAxis: [
+					    {
+					      type: 'category',
+					      data: title,
+					      axisTick: {
+									show:false,
+					        alignWithLabel: true
+					      }
+					    }
+					  ],
+					  yAxis: [
+					    {
+					      type: 'value',
+								axisLine: {
+									show:false
+								},
+								axisTick:{
+									show:false
+								}
+					    }
+					  ],
+					  series: [
+					    {
+					      type: 'bar',
+					      barWidth: '30%',
+								color: '#FFD68D',
+					      data: datas
+					    }
+					  ]
+				}
+		  });
+	}
+	
+	// 楼栋报修
+	buildingChart(){
+		let postData:any = {
+		  startDate: this.dateRange[0],
+		  endDate: this.dateRange[1],
+			type: 'buildingTop5',
+		  hosId: this.hosId,
+		  dutyId: this.dutyId,
+		  parentDutyId: this.parentDutyId,
+		};
+		this.mainService
+		  .getReportData(postData)
+		  .subscribe((result:any) => {
+		    let datas = []
+		    let title = []
+		    for(let i of result.data){
+		    	datas.push(i.sum)
+		    	title.push(i.name)
+		    }
+		    this.buildingOptions = {
+		    	tooltip: {
+		    	    trigger: 'axis',
+		    	    axisPointer: {
+		    	      type: 'shadow'
+		    	    }
+		    	  },
+		    	  grid: {
+		    	    left: '3%',
+		    	    right: '4%',
+		    	    bottom: '3%',
+		    	    containLabel: true
+		    	  },
+		    	  xAxis: [
+		    	    {
+		    	      type: 'category',
+		    	      data: title,
+		    	      axisTick: {
+		    	  			show:false,
+		    	        alignWithLabel: true
+		    	      }
+		    	    }
+		    	  ],
+		    	  yAxis: [
+		    	    {
+		    	      type: 'value',
+		    	  		axisLine: {
+		    	  			show:false
+		    	  		},
+		    	  		axisTick:{
+		    	  			show:false
+		    	  		}
+		    	    }
+		    	  ],
+		    	  series: [
+		    	    {
+		    	      type: 'bar',
+		    	      barWidth: '30%',
+		    				color: '#72C0DD',
+		    	      data: datas
+		    	    }
+		    	  ]
+		    }
+		  });
+	}
+	
+	// 科室费用
+	getDeptCostData() {
+	  let postData:any = {
+	    startDate: this.dateRange[0],
+	    endDate: this.dateRange[1],
+			type: 'deptTop5',
+	    hosId: this.hosId,
+	    dutyId: this.dutyId,
+	    parentDutyId: this.parentDutyId,
+	  };
+	  this.mainService
+	    .getReportData(postData)
+	    .subscribe((result:any) => {
+	      this.deptCostData = result.data || [];
+	    });
+	}
+	
+	// 耗材
+	getConsumableData() {
+	  let postData:any = {
+	    startDate: this.dateRange[0],
+	    endDate: this.dateRange[1],
+			type: 'consumableTop5',
+	    hosId: this.hosId,
+	    dutyId: this.dutyId,
+	    parentDutyId: this.parentDutyId,
+	  };
+	  this.mainService
+	    .getReportData(postData)
+	    .subscribe((result:any) => {
+				this.isLoading = false;
+	      this.consumableData = result.data || [];
+	    });
+	}
+	
+	// 更多跳转
+	toPath(type){
+		console.log(type)
+	}
+	
   // 初始化缓存数据
   queryType:any;
   hosId:any;
@@ -71,9 +352,6 @@ export class SynthesizeStatisticsComponent implements OnInit {
       dutyId: this.dutyId,
       parentDutyId: this.parentDutyId,
     };
-    if (field && sort) {
-      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
-    }
     this.loading1 = true;
     this.mainService
       .postCustom("itsm/report", "incidentWorkOrder", postData)
@@ -83,49 +361,72 @@ export class SynthesizeStatisticsComponent implements OnInit {
         this.listLength = result.totalCount;
       });
   }
-
-  // 列表排序
-  sortCurrent = {};
-  sortCurrentKey: string = "";
-  sortCurrentValue: string | null = "";
-  sort(e) {
-    const { key, value } = e;
-    this.sortCurrentKey = key;
-    this.sortCurrentValue = value;
-    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
-  }
+	
+	// 头部工单数据
+	getWorkData() {
+	  let postData:any = {
+	    startDate: this.dateRange[0],
+	    endDate: this.dateRange[1],
+			type: 'headerCount',
+	    hosId: this.hosId,
+	    dutyId: this.dutyId,
+	    parentDutyId: this.parentDutyId,
+	  };
+	  this.mainService
+	    .getReportData(postData)
+	    .subscribe((result:any) => {
+	      this.workData = result.data[0] || [];
+	    });
+	}
+	
+	// 维修处理
+	getMaintainData() {
+	  let postData:any = {
+	    startDate: this.dateRange[0],
+	    endDate: this.dateRange[1],
+			type: 'userHandleTop5',
+			groupType: this.activeIndex==0?'user':'group',
+	    hosId: this.hosId,
+	    dutyId: this.dutyId,
+	    parentDutyId: this.parentDutyId,
+	  };
+	  this.mainService
+	    .getReportData(postData)
+	    .subscribe((result:any) => {
+	      this.maintainData = result.data || [];
+	    });
+	}
 
   // 搜索
-  search(num?: number) {
-    if (num !== undefined) {
-      this.getList(num, this.sortCurrentKey, this.sortCurrentValue);
-    } else {
-      this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
-    }
+  search() {
+		this.isLoading = true
+		this.getWorkData();
+		this.getMaintainData();
+		this.repairsChart();
+		this.malfunctionChart();
+		this.buildingChart();
+		this.getDeptCostData();
+		this.getConsumableData();
   }
 
   // 日期选择 日
   dateRange: any = [format(startOfMonth(addMonths(new Date(), -2)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]; //发起时间区间 天
   changeDate(result?): void {
-    console.log(this.dateRange);
-    console.log(result);
     result[0] = format(result[0], 'yyyy-MM-dd HH:mm:ss');
     result[1] = format(result[1], 'yyyy-MM-dd HH:mm:ss');
     this.dateRange = result;
-    this.search();
+    // this.search();
+		console.log(this.dateRange);
   }
 
   onCalendarChangeDate(dateArr){
-    console.log(dateArr)
-    if(dateArr.length == 2){
-      let dateStart = new Date(dateArr[0]);
-      let dateEnd = new Date(dateArr[1]);
-      dateStart.setHours(0,0,0);
-      dateEnd.setHours(23,59,59);
-      this.dateRange = [dateStart,dateEnd];
-    }
+    // console.log(dateArr)
+    // if(dateArr.length == 2){
+    //   let dateStart = new Date(dateArr[0]);
+    //   let dateEnd = new Date(dateArr[1]);
+    //   dateStart.setHours(0,0,0);
+    //   dateEnd.setHours(23,59,59);
+    //   this.dateRange = [dateStart,dateEnd];
+    // }
   }
-
-  excelExport(){}
-  reset(){}
 }

src/app/views/new-statistics/maintenance-statistics/synthesize-statistics/synthesize-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { SynthesizeStatisticsRoutingModule } from './synthesize-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { VirtualScrollerModule } from 'ngx-virtual-scroller';
+import { NgxEchartsModule } from 'ngx-echarts';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { VirtualScrollerModule } from 'ngx-virtual-scroller';
     SynthesizeStatisticsRoutingModule,
     ShareModule,
     VirtualScrollerModule,
+		NgxEchartsModule
   ]
 })
 export class SynthesizeStatisticsModule { }

src/assets/iconfont/demo_index.html

@@ -55,6 +55,48 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon icon_transport">&#xe66c;</span>
+                <div class="name">top2</div>
+                <div class="code-name">&amp;#xe66c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe6b1;</span>
+                <div class="name">top1</div>
+                <div class="code-name">&amp;#xe6b1;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe66e;</span>
+                <div class="name">top1-copy</div>
+                <div class="code-name">&amp;#xe66e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe66f;</span>
+                <div class="name">top3-copy</div>
+                <div class="code-name">&amp;#xe66f;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe661;</span>
+                <div class="name">top1-copy</div>
+                <div class="code-name">&amp;#xe661;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe667;</span>
+                <div class="name">top2-copy</div>
+                <div class="code-name">&amp;#xe667;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe66a;</span>
+                <div class="name">top3-copy</div>
+                <div class="code-name">&amp;#xe66a;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon icon_transport">&#xe66d;</span>
                 <div class="name">统计_面性</div>
                 <div class="code-name">&amp;#xe66d;</div>
@@ -1014,9 +1056,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'icon_transport';
-  src: url('iconfont.woff2?t=1740018666479') format('woff2'),
-       url('iconfont.woff?t=1740018666479') format('woff'),
-       url('iconfont.ttf?t=1740018666479') format('truetype');
+  src: url('iconfont.woff2?t=1740462451907') format('woff2'),
+       url('iconfont.woff?t=1740462451907') format('woff'),
+       url('iconfont.ttf?t=1740462451907') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -1043,6 +1085,69 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon icon_transport transport-top1"></span>
+            <div class="name">
+              top2
+            </div>
+            <div class="code-name">.transport-top1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-top2"></span>
+            <div class="name">
+              top1
+            </div>
+            <div class="code-name">.transport-top2
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-top31"></span>
+            <div class="name">
+              top1-copy
+            </div>
+            <div class="code-name">.transport-top31
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-top5"></span>
+            <div class="name">
+              top3-copy
+            </div>
+            <div class="code-name">.transport-top5
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-top4"></span>
+            <div class="name">
+              top1-copy
+            </div>
+            <div class="code-name">.transport-top4
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-top3"></span>
+            <div class="name">
+              top2-copy
+            </div>
+            <div class="code-name">.transport-top3
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-top"></span>
+            <div class="name">
+              top3-copy
+            </div>
+            <div class="code-name">.transport-top
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon icon_transport transport-tongji-2"></span>
             <div class="name">
               统计_面性
@@ -2484,6 +2589,62 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-top1"></use>
+                </svg>
+                <div class="name">top2</div>
+                <div class="code-name">#transport-top1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-top2"></use>
+                </svg>
+                <div class="name">top1</div>
+                <div class="code-name">#transport-top2</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-top31"></use>
+                </svg>
+                <div class="name">top1-copy</div>
+                <div class="code-name">#transport-top31</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-top5"></use>
+                </svg>
+                <div class="name">top3-copy</div>
+                <div class="code-name">#transport-top5</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-top4"></use>
+                </svg>
+                <div class="name">top1-copy</div>
+                <div class="code-name">#transport-top4</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-top3"></use>
+                </svg>
+                <div class="name">top2-copy</div>
+                <div class="code-name">#transport-top3</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-top"></use>
+                </svg>
+                <div class="name">top3-copy</div>
+                <div class="code-name">#transport-top</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#transport-tongji-2"></use>
                 </svg>
                 <div class="name">统计_面性</div>

src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon_transport"; /* Project id 4543613 */
-  src: url('iconfont.woff2?t=1740018666479') format('woff2'),
-       url('iconfont.woff?t=1740018666479') format('woff'),
-       url('iconfont.ttf?t=1740018666479') format('truetype');
+  src: url('iconfont.woff2?t=1740462451907') format('woff2'),
+       url('iconfont.woff?t=1740462451907') format('woff'),
+       url('iconfont.ttf?t=1740462451907') format('truetype');
 }
 
 .icon_transport {
@@ -13,6 +13,34 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.transport-top1:before {
+  content: "\e66c";
+}
+
+.transport-top2:before {
+  content: "\e6b1";
+}
+
+.transport-top31:before {
+  content: "\e66e";
+}
+
+.transport-top5:before {
+  content: "\e66f";
+}
+
+.transport-top4:before {
+  content: "\e661";
+}
+
+.transport-top3:before {
+  content: "\e667";
+}
+
+.transport-top:before {
+  content: "\e66a";
+}
+
 .transport-tongji-2:before {
   content: "\e66d";
 }

src/assets/iconfont/iconfont.json

@@ -6,6 +6,55 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "6020437",
+      "name": "top2",
+      "font_class": "top1",
+      "unicode": "e66c",
+      "unicode_decimal": 58988
+    },
+    {
+      "icon_id": "10940451",
+      "name": "top1",
+      "font_class": "top2",
+      "unicode": "e6b1",
+      "unicode_decimal": 59057
+    },
+    {
+      "icon_id": "36633839",
+      "name": "top1-copy",
+      "font_class": "top31",
+      "unicode": "e66e",
+      "unicode_decimal": 58990
+    },
+    {
+      "icon_id": "36633844",
+      "name": "top3-copy",
+      "font_class": "top5",
+      "unicode": "e66f",
+      "unicode_decimal": 58991
+    },
+    {
+      "icon_id": "37616593",
+      "name": "top1-copy",
+      "font_class": "top4",
+      "unicode": "e661",
+      "unicode_decimal": 58977
+    },
+    {
+      "icon_id": "37616599",
+      "name": "top2-copy",
+      "font_class": "top3",
+      "unicode": "e667",
+      "unicode_decimal": 58983
+    },
+    {
+      "icon_id": "40194473",
+      "name": "top3-copy",
+      "font_class": "top",
+      "unicode": "e66a",
+      "unicode_decimal": 58986
+    },
+    {
       "icon_id": "22892996",
       "name": "统计_面性",
       "font_class": "tongji-2",