update

src/main/webapp/app/analysis/analysis.service.ts

@@ -95,4 +95,9 @@ export class AnalysisService {
         return this.http.post(SERVER_API_URL + '/statistics/statisticalReport/getImport' , data);
     }
 
+    //导出 可用性
+    findFailureRateImport(data): Observable<any>{
+        return this.http.post(SERVER_API_URL + '/statistics/findFailureRate/getImport' , data);
+    }
+
 }

src/main/webapp/app/analysis/operation-work/analysis-deal/analysis-deal.component.ts

@@ -63,7 +63,8 @@ export class AnalysisDealComponent implements OnInit {
                 trigger: 'axis',
                 axisPointer: {            // 坐标轴指示器，坐标轴触发有效
                     type: 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
-                }
+                },
+                formatter: "{b} : {c}个"
             },
             xAxis: {
                 type: 'category',

src/main/webapp/app/analysis/operation-work/analysis-event/analysis-event.component.ts

@@ -63,7 +63,8 @@ export class AnalysisEventComponent implements OnInit {
                 trigger: 'axis',
                 axisPointer: {            // 坐标轴指示器，坐标轴触发有效
                     type: 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
-                }
+                },
+                formatter: "{b} : {c}个"
             },
             xAxis: {
                 type: 'category',

src/main/webapp/app/analysis/operation-work/analysis-status/analysis-status.component.ts

@@ -62,7 +62,8 @@ export class AnalysisStatusComponent implements OnInit {
                 trigger: 'axis',
                 axisPointer: {            // 坐标轴指示器，坐标轴触发有效
                     type: 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
-                }
+                },
+                formatter: "{b} : {c}个"
             },
             xAxis: {
                 type: 'category',

src/main/webapp/app/analysis/resource-alarm/resource-alarm.component.ts

@@ -125,7 +125,7 @@ export class ResourceAlarmComponent implements OnInit {
                 trigger: 'axis',
                 axisPointer : {            // 坐标轴指示器，坐标轴触发有效
                     type : 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
-                }
+                },
             },
             xAxis: {
                 type: 'category',
@@ -192,7 +192,7 @@ export class ResourceAlarmComponent implements OnInit {
                 trigger: 'axis',
                 axisPointer: {            // 坐标轴指示器，坐标轴触发有效
                     type: 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
-                }
+                },
             },
             legend: {
                 data:['严重','告警']

src/main/webapp/app/analysis/resource-usabil/resource-usabil.component.html

@@ -19,7 +19,7 @@
     </div>
 </div>
 <div nz-row [nzGutter]="4" class="search-form">
-    <div nz-col nzSpan="3">
+    <div nz-col nzSpan="4">
         <nz-select style="width: 100%;" nzPlaceHolder="选择分组" [(ngModel)]="obj.groupid">
             <ng-container *ngFor="let item of groupList">
                 <nz-option nzLabel="{{item.name}}" nzValue="{{item.groupid}}"></nz-option>
@@ -36,11 +36,7 @@
             <label nz-radio-button nzValue="5">自定义</label>
         </nz-radio-group>
     </div>
-    <div nz-col nzSpan="8"
-
-
-
-    >
+    <div nz-col nzSpan="8">
         <ng-container *ngIf="timeType == '5'">
             <nz-date-picker
                     nzShowTime
@@ -60,6 +56,11 @@
                                                                  style="color: #6097b7"></i>搜索
         </button>
     </div>
+    <div nz-col nzSpan="3">
+        <nz-spin [nzIndicator]="indicatorTemplate" nzTip='下载中...' [nzSpinning]="isDownload">
+            <button (click)="downLoadCommon()" nz-button nzType="default"><i class="anticon anticon-download"></i>下载</button>
+        </nz-spin>
+    </div>
 </div>
 <nz-spin [nzSpinning]="isLoading">
     <div style="margin-top: 30px" nz-row nzGutter="4">
@@ -85,3 +86,5 @@
         </div>
     </div>
 </nz-spin>
+<ng-template #indicatorTemplate><i class="anticon anticon-spin anticon-loading" style="font-size: 24px;"></i></ng-template>
+

src/main/webapp/app/analysis/resource-usabil/resource-usabil.component.ts

@@ -3,6 +3,8 @@ import {AnalysisService} from '../analysis.service';
 import {NzMessageService} from 'ng-zorro-antd';
 import {DatePipe} from '@angular/common';
 import {OverAllService} from '../../overAll/overAll.service';
+import {WorkService} from '../../work/work.service';
+import {CommonService} from '../../shared/common/common.service';
 
 @Component({
     selector: 'smart-resource-usabil',
@@ -38,8 +40,10 @@ export class ResourceUsabilComponent implements OnInit {
     groupid;
     groupList;
 
+    isDownload = false;
+
     constructor(private analysisSer: AnalysisService, private message: NzMessageService, private datePipe: DatePipe,
-                private overAllSer: OverAllService,) {
+                private overAllSer: OverAllService,private workSer:WorkService,private commonSer:CommonService) {
     }
 
     ngOnInit() {
@@ -97,7 +101,8 @@ export class ResourceUsabilComponent implements OnInit {
                 trigger: 'axis',
                 axisPointer : {            // 坐标轴指示器，坐标轴触发有效
                     type : 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
-                }
+                },
+                formatter: "{b} : {c}%"
             },
             xAxis: {
                 type: 'category',
@@ -158,7 +163,8 @@ export class ResourceUsabilComponent implements OnInit {
                 trigger: 'axis',
                 axisPointer : {            // 坐标轴指示器，坐标轴触发有效
                     type : 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
-                }
+                },
+                formatter: "{b} : {c}%"
             },
             xAxis: {
                 type: 'category',
@@ -232,4 +238,24 @@ export class ResourceUsabilComponent implements OnInit {
         this.getTopEcharts();
     }
 
+    //导出 可用性
+    downLoadCommon(){
+        this.isDownload = true;
+        const data = {
+            groupid: this.obj.groupid,
+            startTime: this.obj.startTime,
+            endTime: this.obj.endTime,
+        };
+        this.analysisSer.findFailureRateImport(data).subscribe(
+            (res)=>{
+                this.workSer.downloadTemplate('failureRate',res.data).subscribe(
+                    (data)=>{
+                        this.isDownload = false;
+                        this.commonSer.downloadFile('资源可用性统计',data)
+                    }
+                )
+            }
+        )
+    }
+
 }