bug update

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

@@ -550,7 +550,7 @@ export class BasicComponent implements OnInit {
     //前往设备类型页面
     goEquip(item) {
         let type;
-        if (item.equipmentType == '数据库') {
+        if (item.equipmentType == '数据库' || item.equipmentType == '业务软件') {
             type = 'database';
         } else if (item.equipmentType == '交换机') {
             type = 'switch';

src/main/webapp/app/overAll/modal/database/database.component.html

@@ -42,7 +42,7 @@
                 告警总数趋势
             </div>
             <div class="host-item-content">
-                <nz-radio-group class="time-group" [(ngModel)]="timeTypeFlow" (ngModelChange)="changeTypeFlow()">
+                <nz-radio-group class="time-group" [(ngModel)]="timeTypeFlow" (ngModelChange)="changeTypeFlow($event)">
                     <label nz-radio-button nzValue="3">三天</label>
                     <label nz-radio-button nzValue="4">一周</label>
                     <label nz-radio-button nzValue="5">一月</label>
@@ -72,7 +72,7 @@
                     <nz-col nzSpan="20" class="padding-left-10" style="position: relative;">
                         <div>
                             <nz-select class="time-group" nzPlaceHolder="选择分组"
-                                       (ngModelChange)="changeTypeDatabase()" [(ngModel)]="timeTypeDatabase">
+                                       (ngModelChange)="changeTypeDatabase($event)" [(ngModel)]="timeTypeDatabase">
                                 <nz-option nzLabel="最近一小时" nzValue="0"></nz-option>
                                 <nz-option nzLabel="最近一天" nzValue="2"></nz-option>
                                 <nz-option nzLabel="最近三天" nzValue="3"></nz-option>

src/main/webapp/app/overAll/modal/database/database.component.ts

@@ -61,19 +61,21 @@ export class DatabaseComponent implements OnInit {
         this.findDatabase();
         this.findIndexDetail();
         this.eventFind();
-        this.changeTypeFlow();
-        this.changeTypeDatabase();
+        this.changeTypeFlow('4');
+        this.changeTypeDatabase('0');
     }
 
     //查询所有数据库类型
     findDatabase() {
         this.overAllSer.findAllDatabaseByHost(this.hostId).subscribe(
             (res) => {
-                if(res.errCode == 10000){
-                    this.databaseList = res.data;
-                    this.databaseType = this.databaseList[0].type;
-                    this.findTarget();
-                }else{
+                if (res.errCode == 10000) {
+                    if (res.data.length > 0) {
+                        this.databaseList = res.data;
+                        this.databaseType = this.databaseList[0].type;
+                        this.findTarget();
+                    }
+                } else {
                     this.message.error(res.errMsg);
                 }
             }
@@ -122,8 +124,9 @@ export class DatabaseComponent implements OnInit {
         );
     }
 
-    changeTypeFlow() {
+    changeTypeFlow(e) {
         this.isFlowLoading = true;
+        this.timeTypeFlow = e;
         this.flowObj = this.commonSer.getTimeByType(this.timeTypeFlow);
         this.getAlarmTrend();
     }
@@ -138,8 +141,10 @@ export class DatabaseComponent implements OnInit {
         this.overAllSer.waringTrendByHost(data).subscribe(
             (res) => {
                 if (res.errCode == 10000) {
+                    if (res.data) {
                         const response = res.data;
                         this.setAlarmTrend(response);
+                    }
                 } else {
                     this.message.error(res.errMsg);
                 }
@@ -229,8 +234,9 @@ export class DatabaseComponent implements OnInit {
         };
     }
 
-    changeTypeDatabase() {
+    changeTypeDatabase(e) {
         this.isDatabaseLoading = true;
+        this.timeTypeDatabase = e;
         this.databaseObj = this.commonSer.getTimeByType(this.timeTypeDatabase);
         this.databaseChart();
     }

src/main/webapp/app/overAll/modal/server/server.component.html

@@ -73,7 +73,7 @@
                             </nz-row>
                             <nz-row>
                                 <nz-col nzSpan="8">IP地址：</nz-col>
-                                <nz-col nzSpan="16">{{server?.ip || '-'}}</nz-col>
+                                <nz-col nzSpan="16">{{server?.host || '-'}}</nz-col>
                             </nz-row>
                             <nz-row>
                                 <nz-col nzSpan="8">设备类型：</nz-col>