update

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

@@ -150,8 +150,7 @@
     </ng-container>
     </tbody>
 </nz-table>
-<ng-template #indicatorTemplate><i class="anticon anticon-spin anticon-loading" style="font-size: 24px;"></i>
-</ng-template>
+<ng-template #indicatorTemplate><i class="anticon anticon-spin anticon-loading" style="font-size: 24px;"></i></ng-template>
 <nz-modal [(nzVisible)]="isVisiable" nzWidth="780" [nzTitle]="title" [nzFooter]="null" (nzOnCancel)="handleCancel()">
     <nz-table #nzTable [nzData]="modalList" [nzFrontPagination]="true">
         <thead>

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

@@ -36,18 +36,24 @@
             <label nz-radio-button nzValue="5">自定义</label>
         </nz-radio-group>
     </div>
-    <div nz-col nzSpan="8" *ngIf="timeType == '5'">
-        <nz-date-picker
-                nzShowTime
-                [(ngModel)]="startTime"
-                nzPlaceHolder="开始时间"
-        ></nz-date-picker>
-        <nz-date-picker
-                nzShowTime
-                nzFormat="yyyy-MM-dd HH:mm:ss"
-                [(ngModel)]="endTime"
-                nzPlaceHolder="结束时间"
-        ></nz-date-picker>
+    <div nz-col nzSpan="8"
+
+
+
+    >
+        <ng-container *ngIf="timeType == '5'">
+            <nz-date-picker
+                    nzShowTime
+                    [(ngModel)]="startTime"
+                    nzPlaceHolder="开始时间"
+            ></nz-date-picker>
+            <nz-date-picker
+                    nzShowTime
+                    nzFormat="yyyy-MM-dd HH:mm:ss"
+                    [(ngModel)]="endTime"
+                    nzPlaceHolder="结束时间"
+            ></nz-date-picker>
+        </ng-container>
     </div>
     <div nz-col nzSpan="2" class="text-right">
         <button (click)="search()" nz-button nzType="default"><i class="anticon anticon-search"

src/main/webapp/app/overAll/template/template.component.html

@@ -122,6 +122,7 @@
           <span (click)="goToTri(item)">{{item.triggersCount}}</span>
         </td>
         <td class="handle main-color">
+          <span (click)="cloneTemp(item)">克隆</span>
           <span (click)="showTempEditModal(item)">编辑</span>
           <span (click)="showDeleteConfirm(item)">删除</span>
         </td>
@@ -131,6 +132,9 @@
   </tbody>
 </nz-table>
 
+<nz-spin style="position: absolute;top: 35%;left: 50%;" [nzIndicator]="indicatorTemplate" nzTip='克隆中...' [nzSpinning]="isClone"></nz-spin>
+<ng-template #indicatorTemplate><i class="anticon anticon-spin anticon-loading" style="font-size: 24px;"></i></ng-template>
+
 <!-- 添加资源-->
 <smart-basic-edit #basicEdit (done)="handleOk($event)"></smart-basic-edit>
 <!--添加监测点-->

src/main/webapp/app/overAll/template/template.component.ts

@@ -62,6 +62,8 @@ export class TemplateComponent implements OnInit {
     templateList = [];
     indeterminate;
 
+    isClone = false;
+
     constructor(private fb: FormBuilder, private overAllSer: OverAllService, private router: Router,
                 private modalService: NzModalService, private message: NzMessageService, private main: JhiMainComponent) {
     }
@@ -409,6 +411,7 @@ export class TemplateComponent implements OnInit {
             nzOkText: '确定',
             nzOkType: 'danger',
             nzOnOk: () => {
+                this.isClone = true;
                 const data = {
                     templateid: Number(item.templateid)
                 };
@@ -420,6 +423,7 @@ export class TemplateComponent implements OnInit {
                         } else {
                             this.message.info(res.errMsg);
                         }
+                        this.isClone = false;
                     }
                 );
             },