Merge branch 'master' into develop

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

@@ -9,7 +9,7 @@
 		</div>
 		<div class="operation">
 			<button nz-button class="btn default" (click)="search()">搜索</button>
-			<button nz-button class="btn default ml8" (click)="search()">重置</button>
+			<button nz-button class="btn default ml8" (click)="reset()">重置</button>
 		</div>
 	</div>
 	<div class="top1-statistics">
@@ -163,4 +163,6 @@
 		</div>
 	</div>
 </div>
-<nz-spin nzSimple *ngIf="isLoading"></nz-spin>
+<div class="mask-style" *ngIf="isLoading">
+	<nz-spin nzSimple class="spin-style"></nz-spin>
+</div>

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

@@ -204,4 +204,20 @@
 			margin-bottom: 8px;
 		}
 	}
+}
+
+.mask-style{
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 999;
+	display: flex;
+	background: rgba(0,0,0,0.2);
+	align-items: center;
+	justify-content: center;
+}
+.spin-style{
+	z-index:9999;
 }

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

@@ -396,7 +396,14 @@ export class SynthesizeStatisticsComponent implements OnInit {
 	      this.maintainData = result.data || [];
 	    });
 	}
-
+	
+	// 重置
+	reset(){
+		this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')];
+		this.activeIndex = 0;
+		this.search();
+	}
+	
   // 搜索
   search() {
 		this.isLoading = true
@@ -410,7 +417,7 @@ export class SynthesizeStatisticsComponent implements OnInit {
   }
 
   // 日期选择 日
-  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')]; //发起时间区间 天
+  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');