综合统计优化2

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

@@ -57,7 +57,6 @@ export class SynthesizeStatisticsComponent implements OnInit {
 		}
 	] //报修耗材
   ngOnInit() {
-    this.initSessionData();
     this.search();
   }
 	
@@ -335,6 +334,15 @@ export class SynthesizeStatisticsComponent implements OnInit {
       this.dutyId = undefined;
       this.parentDutyId = dutyId;
     }
+		
+		this.isLoading = true
+		this.getWorkData();
+		this.getMaintainData();
+		this.repairsChart();
+		this.malfunctionChart();
+		this.buildingChart();
+		this.getDeptCostData();
+		this.getConsumableData();
   }
 
   // 表格数据
@@ -406,21 +414,14 @@ export class SynthesizeStatisticsComponent implements OnInit {
 	
   // 搜索
   search() {
-		this.isLoading = true
-		this.getWorkData();
-		this.getMaintainData();
-		this.repairsChart();
-		this.malfunctionChart();
-		this.buildingChart();
-		this.getDeptCostData();
-		this.getConsumableData();
+		this.initSessionData();
   }
 
   // 日期选择 日
   dateRange: any = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]; //发起时间区间 天
   changeDate(result?): void {
-    result[0] = format(result[0], 'yyyy-MM-dd HH:mm:ss');
-    result[1] = format(result[1], 'yyyy-MM-dd HH:mm:ss');
+    result[0] = format(result[0], 'yyyy-MM-dd') + ' ' + '00:00:00';
+    result[1] = format(result[1], 'yyyy-MM-dd') + ' ' + '23:59:59';
     this.dateRange = result;
     // this.search();
 		console.log(this.dateRange);