bug update

src/main/webapp/app/blocks/interceptor/notification.interceptor.ts

@@ -31,7 +31,7 @@ export class NotificationInterceptor implements HttpInterceptor {
         if (data && data.errCode) {
             const errCode = data.errCode;
             const errMsg = data.errMsg;
-            if (errCode && errCode != 10000 && errCode != 10099 && errCode == 10103) {
+            if (errCode && errCode != 10000 && errCode != 10099) {
                 this.notification.create('error', `错误码:${errCode}`, `${errMsg}`, {nzDuration: 2000});
             }
         }

src/main/webapp/app/business/b-overview/b-overview.component.html

@@ -44,8 +44,8 @@
           </div>
           <div nz-col nzSpan="12" class="spanBorder">
             <span (click)="reportDetail(item)">运行报告</span>
-            <span (click)="goTo(item)" >业务拓扑</span>
-            <span routerLink="../effectAnalysis">效能分析</span>
+            <span (click)="goToTopo(item)" >业务拓扑</span>
+            <span (click)="goToAnalysis(item)">效能分析</span>
           </div>
         </div>
         <div nz-row>

src/main/webapp/app/business/b-overview/b-overview.component.ts

@@ -206,7 +206,7 @@ export class BOverviewComponent implements OnInit {
     }
 
     //bTopology
-    goTo(item){
+    goToTopo(item){
         this.router.navigate(['app/main/bTopology'],{
             queryParams:{
                 topoId:item.id
@@ -214,4 +214,12 @@ export class BOverviewComponent implements OnInit {
         })
     }
 
+    //effectAnalysis
+    goToAnalysis(item){
+        this.router.navigate(['app/main/effectAnalysis'],{
+            queryParams:{
+                topoId:item.id
+            }
+        })
+    }
 }

src/main/webapp/app/business/b-topology/b-topology.component.html

@@ -22,7 +22,7 @@
   <div nz-col nzSpan="12">
     <nz-select style="width: 200px;" nzPlaceHolder="选择业务" [(ngModel)]="topoId" (ngModelChange)="getDetail()">
       <ng-container *ngFor="let item of rootList">
-        <nz-option [nzLabel]="item.name" [nzValue]="item.serviceid"></nz-option>
+        <nz-option [nzLabel]="item.name" nzValue="{{item.serviceid}}"></nz-option>
       </ng-container>
     </nz-select>
   </div>

src/main/webapp/app/business/b-topology/b-topology.component.ts

@@ -97,13 +97,14 @@ export class BTopologyComponent implements OnInit, AfterViewInit {
     editType = '只读模式';
 
     constructor(private busineSer: BusinessService, private message: NzMessageService,
-                private routerInfo:ActivatedRoute) {
+                private routerInfo: ActivatedRoute) {
         this.routerInfo.queryParams.subscribe(
             (res) => {
-                console.log(res);
-                this.topoId = res.topoId;
+                if (res) {
+                    this.topoId = res.topoId + '';
                     this.getDetail();
                 }
+            }
         );
     }
 

src/main/webapp/app/business/effect-analysis/effect-analysis.component.html

@@ -22,7 +22,7 @@
   <div nz-col nzSpan="12">
     <nz-select style="width: 200px;" nzPlaceHolder="选择业务" [(ngModel)]="serviceId" (ngModelChange)="changeService()">
       <ng-container *ngFor="let item of rootList">
-        <nz-option [nzLabel]="item.name" [nzValue]="item.serviceid"></nz-option>
+        <nz-option [nzLabel]="item.name" nzValue="{{item.serviceid}}"></nz-option>
       </ng-container>
     </nz-select>
   </div>

src/main/webapp/app/business/effect-analysis/effect-analysis.component.ts

@@ -5,6 +5,7 @@ import {DatePipe} from '@angular/common';
 import {color} from '../../app.constants';
 import {NzMessageService} from 'ng-zorro-antd';
 import {CommonService} from '../../shared/common/common.service';
+import {ActivatedRoute} from '@angular/router';
 
 @Component({
     selector: 'smart-effect-analysis',
@@ -82,8 +83,17 @@ export class EffectAnalysisComponent implements OnInit {
     chartUser;
 
     constructor(private busineSer: BusinessService, private overAllSer: OverAllService,
-                private commonSer:CommonService,
+                private commonSer: CommonService,
+                private routerInfo: ActivatedRoute,
                 private datePipe: DatePipe, private message: NzMessageService) {
+        this.routerInfo.queryParams.subscribe(
+            (res) => {
+                if (res) {
+                    this.serviceId = res.topoId + '';
+                    this.changeService();
+                }
+            }
+        );
     }
 
     ngOnInit() {
@@ -211,10 +221,12 @@ export class EffectAnalysisComponent implements OnInit {
             (res) => {
                 this.rootList = res.data;
                 if (this.rootList.length > 0) {
+                    if (!this.serviceId) {
                         this.serviceId = this.rootList[0].serviceid;
                         this.changeService();
                     }
                 }
+            }
         );
     }
 
@@ -336,7 +348,7 @@ export class EffectAnalysisComponent implements OnInit {
     //时间改变
     changeType() {
         this.isSpinning = true;
-        if(this.timeType =='99') return ;
+        if (this.timeType == '99') return;
         this.obj.startTime = this.commonSer.getTimeByType(this.timeType).startTime;
         this.obj.endTime = this.commonSer.getTimeByType(this.timeType).endTime;
         this.findChart();

src/main/webapp/app/modal/website/website.component.html

@@ -10,7 +10,7 @@
                                     <nz-form-item nzFlex>
                                         <nz-form-label [nzSpan]="6" nzRequired nzFor="webName">网站名称</nz-form-label>
                                         <nz-form-control [nzSpan]="14">
-                                            <input id="webName" name="webName" nz-input placeholder="网站名称" [(ngModel)]="validateForm.name">
+                                            <input id="webName" maxlength="20" name="webName" nz-input placeholder="网站名称" [(ngModel)]="validateForm.name">
                                         </nz-form-control>
                                     </nz-form-item>
                                 </div>
@@ -42,7 +42,7 @@
                                     <nz-form-item nzFlex>
                                         <nz-form-label [nzSpan]="3" nzFor="http_proxy">Http代理</nz-form-label>
                                         <nz-form-control [nzSpan]="18">
-                                            <input id="http_proxy" name="http_proxy" nz-input placeholder="默认"
+                                            <input id="http_proxy" maxlength="40" name="http_proxy" nz-input placeholder="默认"
                                                    [(ngModel)]="validateForm.http_proxy">
                                         </nz-form-control>
                                     </nz-form-item>

src/main/webapp/app/work/inspect-plan/inspect-plan.component.html

@@ -87,8 +87,8 @@
         <td class="handle main-color">
             <span (click)="lookPlan(data.id,data.title)">查看</span>
             <span *ngIf="data.status == 1" (click)="dealPlan(data.id)">处理</span>
-            <span *ngIf="data.status != 2" (click)="editPlan(data.id)">编辑</span>
-            <span class="handle-delete" (click)="deletePlan(data)">删除</span>
+            <span *ngIf="data.status == 0 || data.status == 2"(click)="editPlan(data.id)">编辑</span>
+            <span *ngIf="data.status != 1" class="handle-delete" (click)="deletePlan(data)">删除</span>
         </td>
     </tr>
     </tbody>

tsconfig.json

@@ -10,7 +10,7 @@
         "noImplicitAny": false,
         "skipLibCheck": true,
         "suppressImplicitAnyIndexErrors": true,
-        "outDir": "build/master/app",
+        "outDir": "build/www/app",
         "lib": ["es7", "dom"],
         "typeRoots": [
             "node_modules/@types"