log

src/main/webapp/app/alarm/alarm-log/alarm-log.component.html

@@ -107,7 +107,7 @@
 </nz-table>
 <!--告警内容-->
 <nz-modal [(nzVisible)]="isVisible" [nzFooter]="null" nzTitle="查看告警内容" (nzOnCancel)="handleCancel()"
-          (nzOnOk)="handleOk()" [nzOkLoading]="isOkLoading">
+          >
     <div style="padding: 10px;">
         <p>主题：</p>
         <p>{{title}}</p>

src/main/webapp/app/alarm/modal/alarm-group/alarm-group.component.html

@@ -3,13 +3,14 @@
         <nz-form-item>
             <nz-form-label [nzSpan]="7" nzRequired nzFor="name">告警组名称</nz-form-label>
             <nz-form-control [nzSpan]="12">
-        <input type="text" nz-input formControlName="name" placeholder="告警组名称" >
-        <nz-form-explain *ngIf="validateForm.get('name').dirty && validateForm.get('name').errors">请输入告警组名称</nz-form-explain>
+                <input type="text" nz-input formControlName="name" placeholder="告警组名称">
+                <nz-form-explain *ngIf="validateForm.get('name').dirty && validateForm.get('name').errors">请输入告警组名称
+                </nz-form-explain>
             </nz-form-control>
         </nz-form-item>
         <nz-form-item>
-      <nz-form-label [nzSpan]="7" >组描述</nz-form-label>
-      <nz-form-control [nzSpan]="12" >
+            <nz-form-label [nzSpan]="7">组描述</nz-form-label>
+            <nz-form-control [nzSpan]="12">
                 <textarea formControlName="description" nz-input rows="2" placeholder="分组描述"></textarea>
             </nz-form-control>
         </nz-form-item>

src/main/webapp/app/alarm/modal/media-type/media-type.component.ts

 import {Component, OnInit} from '@angular/core';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
 
 @Component({
     selector: 'smart-media-type',
@@ -8,11 +9,16 @@ import {Component, OnInit} from '@angular/core';
 export class MediaTypeComponent implements OnInit {
 
     isVisible = false;
+    title;
+    validateForm:FormGroup;
 
-    constructor() {
+    constructor(private fb:FormBuilder) {
     }
 
     ngOnInit() {
+        this.validateForm = this.fb.group({
+            name:[null,[Validators.required]]
+        })
     }
 
     showModal() {

src/main/webapp/app/alarm/send-set/send-set.component.html

@@ -19,7 +19,7 @@
   </div>
 </div>
 <div nz-row class="search-form" style="border-top: none;padding: 0 0 15px 0;">
-  <button nz-button nzType="default"><i class="anticon anticon-search"></i>新增发送方式</button>
+  <button nz-button nzType="default"><i class="anticon anticon-plus"></i>新增发送方式</button>
 </div>
 
 <nz-table #nzTable [nzData]="sendList" [nzFrontPagination]="false">

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

 <p>
-  resourse-alarm works!
+  resource-alarm works!
 </p>

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

 import { Component, OnInit } from '@angular/core';
 
 @Component({
-  selector: 'smart-resourse-alarm',
-  templateUrl: './resourse-alarm.component.html',
+  selector: 'smart-resource-alarm',
+  templateUrl: './resource-alarm.component.html',
   styles: []
 })
-export class ResourseAlarmComponent implements OnInit {
+export class ResourceAlarmComponent implements OnInit {
 
   constructor() { }
 

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

 <p>
-  resourse-usabil works!
+  resource-usabil works!
 </p>

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

 import { Component, OnInit } from '@angular/core';
 
 @Component({
-  selector: 'smart-resourse-usabil',
-  templateUrl: './resourse-usabil.component.html',
+  selector: 'smart-resource-usabil',
+  templateUrl: './resource-usabil.component.html',
   styles: []
 })
-export class ResourseUsabilComponent implements OnInit {
+export class ResourceUsabilComponent implements OnInit {
 
   constructor() { }
 

src/main/webapp/app/app.main.module.ts

@@ -44,6 +44,24 @@ import {AlarmGroupComponent} from './alarm/modal/alarm-group/alarm-group.compone
 import {MediaTypeComponent} from './alarm/modal/media-type/media-type.component';
 import {AlarmTargetComponent} from './alarm/modal/alarm-target/alarm-target.component';
 import {BusinessService} from './business/business.service';
+import {BusinessSupComponent} from './analysis/business-sup/business-sup.component';
+import {OperationWorkComponent} from './analysis/operation-work/operation-work.component';
+import {ResourceAlarmComponent} from './analysis/resource-alarm/resource-alarm.component';
+import {ResourceUsabilComponent} from './analysis/resource-usabil/resource-usabil.component';
+import {BTopologyComponent} from './business/b-topology/b-topology.component';
+import {BusinessConfigComponent} from './business/business-config/business-config.component';
+import {EffectAnalysisComponent} from './business/effect-analysis/effect-analysis.component';
+import {OverviewComponent} from './business/overview/overview.component';
+import {NetworkCheckComponent} from './network-check/network-check.component';
+import {BackupComponent} from './smart/backup/backup.component';
+import {HandleComponent} from './smart/handle/handle.component';
+import {ScriptConfigComponent} from './smart/script-config/script-config.component';
+import {AssetPartComponent} from './work/asset-part/asset-part.component';
+import {ContractTrackComponent} from './work/contract-track/contract-track.component';
+import {InspectPlanComponent} from './work/inspect-plan/inspect-plan.component';
+import {KonwledgeBaseComponent} from './work/konwledge-base/konwledge-base.component';
+import {PersonelManageComponent} from './work/personel-manage/personel-manage.component';
+import {WorkHandleComponent} from './work/work-handle/work-handle.component';
 
 @NgModule({
     imports: [
@@ -88,7 +106,25 @@ import {BusinessService} from './business/business.service';
         FlowTrendComponent,
         AlarmGroupComponent,
         MediaTypeComponent,
-        AlarmTargetComponent
+        AlarmTargetComponent,
+        BusinessSupComponent,
+        OperationWorkComponent,
+        ResourceAlarmComponent,
+        ResourceUsabilComponent,
+        BTopologyComponent,
+        BusinessConfigComponent,
+        EffectAnalysisComponent,
+        OverviewComponent,
+        NetworkCheckComponent,
+        BackupComponent,
+        HandleComponent,
+        ScriptConfigComponent,
+        AssetPartComponent,
+        ContractTrackComponent,
+        InspectPlanComponent,
+        KonwledgeBaseComponent,
+        PersonelManageComponent,
+        WorkHandleComponent,
     ],
     providers:[
         OverAllService,

src/main/webapp/app/modal/basic-edit/basic-edit.component.ts

@@ -57,7 +57,7 @@ export class BasicEditComponent implements OnInit {
     //获取分组
     getGroup(){
         this.groupList = [];
-        this.overAllSer.getgroups({}).subscribe(
+        this.overAllSer.findGroup().subscribe(
             (res) => {
                 for (let i = 0; i < res.data.length; i++) {
                     const gObj = {

src/main/webapp/app/modal/create-group/create-group.component.html

@@ -3,15 +3,15 @@
         <nz-form-item>
             <nz-form-label [nzSpan]="7" nzRequired nzFor="name">组名称</nz-form-label>
             <nz-form-control [nzSpan]="12">
-                <input type="text" nz-input formControlName="name" placeholder="组名称" >
-                <nz-form-explain *ngIf="validateForm.get('name').dirty && validateForm.get('name').errors">请输入分组名称</nz-form-explain>
+                <input type="text" nz-input formControlName="name" placeholder="组名称">
+                <nz-form-explain *ngIf="validateForm.get('name').dirty && validateForm.get('name').errors">请输入分组名称
+                </nz-form-explain>
             </nz-form-control>
         </nz-form-item>
         <nz-form-item>
-            <nz-form-label [nzSpan]="7" >组描述</nz-form-label>
-            <nz-form-control [nzSpan]="12" >
+            <nz-form-label [nzSpan]="7" nzFor="groupDescribe">组描述</nz-form-label>
+            <nz-form-control [nzSpan]="12">
                 <textarea formControlName="groupDescribe" nz-input rows="2" placeholder="分组描述"></textarea>
-                <!--<nz-form-explain *ngIf="validateForm.get('comment').dirty&&validateForm.get('comment').hasError('required')">Please write something here!</nz-form-explain>-->
             </nz-form-control>
         </nz-form-item>
     </form>

src/main/webapp/app/modal/create-group/create-group.component.ts

-import { Component, OnInit, Output } from '@angular/core';
+import {Component, OnInit, Output} from '@angular/core';
 import {
     FormBuilder,
     FormControl,
@@ -6,11 +6,11 @@ import {
     ValidationErrors,
     Validators
 } from '@angular/forms';
-import { OverAllService } from "../../overAll/overAll.service";
-import { NzMessageService } from "ng-zorro-antd";
-import { Observable, Observer } from 'rxjs';
-import { EmitService } from "../../shared/event/eventEmitter";
-import { EventEmitter } from "@angular/core";
+import {OverAllService} from '../../overAll/overAll.service';
+import {NzMessageService} from 'ng-zorro-antd';
+import {Observable, Observer} from 'rxjs';
+import {EmitService} from '../../shared/event/eventEmitter';
+import {EventEmitter} from '@angular/core';
 
 @Component({
     selector: 'smart-create-group',
@@ -23,65 +23,91 @@ export class CreateGroupComponent implements OnInit {
     title;
     isCreate = false;
     validateForm: FormGroup;
-    constructor(private fb: FormBuilder,private overAllSer: OverAllService,
-                private message: NzMessageService,private emitService:EmitService) {
-        this.validateForm = this.fb.group({
-            name: [ '', [ Validators.required ],[ this.userNameAsyncValidator ] ],
-            groupDescribe : [ '' ]
-        });
+
+    groupid;
+
+    constructor(private fb: FormBuilder, private overAllSer: OverAllService,
+                private message: NzMessageService, private emitService: EmitService) {
     }
 
     ngOnInit() {
-
+        this.initForm();
     }
 
-    userNameAsyncValidator = (control: FormControl) => Observable.create((observer: Observer<ValidationErrors>) => {
-        setTimeout(() => {
-            if (control.value === 'JasonWood') {
-                observer.next({ error: true, duplicated: true });
-            } else {
-                observer.next(null);
+    showModal(title): void {
+        this.title = title;
+        this.isCreate = true;
     }
-            observer.complete();
-        }, 1000);
-    });
 
-    showModal(title,item): void {
+    showEditModal(title,item){
         this.title = title;
-        this.validateForm = this.fb.group({
-            name: [ '', [ Validators.required ],[ this.userNameAsyncValidator ] ],
-            groupDescribe : [ '' ]
-        });
         this.isCreate = true;
+        this.groupid = item.groupid;
+        this.validateForm.patchValue(item);
     }
 
-    handleOk(): void {
-        for(const i in this.validateForm.controls) {
-            this.validateForm.controls[ i ].markAsDirty();
-            this.validateForm.controls[ i ].updateValueAndValidity();
+    handleOk() {
+        for (const i in this.validateForm.controls) {
+            this.validateForm.controls[i].markAsDirty();
+            this.validateForm.controls[i].updateValueAndValidity();
+        }
+        if(this.validateForm.invalid){
+            return false;
+        }
+
+        if(this.title == '添加分组'){
+            this.create();
+        }else{
+            this.update();
         }
     }
 
-    create(){
+    create() {
         this.overAllSer.createGroup(this.validateForm.value).subscribe(
-            (res)=>{
-                if(res.errCode == 10000){
+            (res) => {
+                if (res.errCode == 10000) {
                     this.message.info('添加成功');
                     this.isCreate = false;
                     this.add.emit();
-                }else{
+                    this.initForm();
+                } else {
                     this.message.info(res.errMsg);
                 }
             }
-        )
+        );
     }
 
-    update(){
-
+    update() {
+        const data = {
+            groupid:this.groupid,
+            groupDescribe:this.validateForm.value.groupDescribe,
+            name:this.validateForm.value.name
+        }
+        this.overAllSer.updataGroup(data).subscribe(
+            (res) => {
+                if (res.errCode == 10000) {
+                    this.message.info('修改成功');
+                    this.isCreate = false;
+                    this.add.emit();
+                    this.initForm();
+                } else {
+                    this.message.info(res.errMsg);
+                }
+            }
+        );
     }
 
     handleCancel(): void {
         this.isCreate = false;
+        this.initForm();
+    }
+
+    //初始化
+    initForm(){
+        this.validateForm = this.fb.group({
+            name: ['', [Validators.required]],
+            groupDescribe: ['']
+        });
     }
 
 }

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

@@ -50,7 +50,7 @@
 <nz-table #nzTable [nzData]="dataSet" nzSingleSort [nzLoading]="loading">
     <thead>
     <tr>
-        <th [nzChecked]="allChecked" (nzCheckedChange)="checkAll($event)"></th>
+        <th [nzChecked]="allChecked"></th>
         <th>名称</th>
         <th>告警状态</th>
         <th nzWidth="20%">状态</th>

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

@@ -191,7 +191,7 @@ export class BasicComponent implements OnInit {
     select() {
         this.loading = true;
         if (this.selectedValue == 'group') {
-            this.overAllSer.findGroup().subscribe(
+            this.overAllSer.getgroups({}).subscribe(
                 (res) => {
                     this.loading = false;
                     if (res.errCode == 10000) {
@@ -293,12 +293,12 @@ export class BasicComponent implements OnInit {
 
     //添加分组
     showGroupModal() {
-        this.smartCreateGroup.showModal('添加分组',null);
+        this.smartCreateGroup.showModal('添加分组');
     }
 
     //编辑分组
     updateGroup(item){
-        this.smartCreateGroup.showModal('修改分组',item);
+        this.smartCreateGroup.showEditModal('修改分组',item);
     }
 
     //删除分组