Merge branch 'master' of http://180.168.156.212:2903/qinghua/smart

src/main/webapp/app/home/home.component.html

@@ -117,7 +117,7 @@
             <nz-tag *ngIf="data.priority == 4 || data.priority == 5" [nzColor]="color.red"></nz-tag>
             <nz-tag *ngIf="data.priority == 2 || data.priority == 3" [nzColor]="color.yellow"></nz-tag>
         </td>
-        <td class="cursor main-color">{{data.hostname}}</td>
+        <td class="cursor main-color" (click)="goToDetail(data)">{{data.hostname}}</td>
         <td>{{data.description}}</td>
         <td>{{data.continuedTime}}</td>
     </tr>

src/main/webapp/app/home/home.component.ts

@@ -7,6 +7,7 @@ import {AlarmService} from '../alarm/alarm.service';
 import {NzMessageService} from 'ng-zorro-antd';
 import {LayoutService} from '../layouts/layout.service';
 import {SelectGroupComponent} from '../modal/select-group/select-group.component';
+import {Router} from '@angular/router';
 
 @Component({
     selector: 'jhi-home',
@@ -83,7 +84,8 @@ export class HomeComponent implements OnInit,AfterViewInit {
         private alarmSer:AlarmService,private renderer:Renderer2,
         private layoutSer:LayoutService,
         private principal: Principal,
-        private eventManager: JhiEventManager
+        private eventManager: JhiEventManager,
+        private router:Router
     ) {
     }
 
@@ -105,6 +107,17 @@ export class HomeComponent implements OnInit,AfterViewInit {
         this.renderer.setStyle(this.leftDiv.nativeElement,"height",rightHeight +"px");
     }
 
+    //查看详情
+    goDetail(item) {
+        this.router.navigate(['app/main/basic-detail'], {
+            queryParams: {
+                hostId: item.hostid,
+                name: item.hostname,
+                hostName: item.hostname
+            }
+        });
+    }
+
     //我的关注
     getMyFollow(){
         this.layoutSer.myFollow().subscribe(

src/main/webapp/app/netTopology/flow-trend/flow-trend.component.html

@@ -34,6 +34,7 @@
             </ng-container>
         </nz-select>
     </div>
+    <ng-container *ngIf="echartType == 'history'">
         <div nz-col nzSpan="7">
             <nz-radio-group style="width: 100%;" [(ngModel)]="timeType" (ngModelChange)="changeType()"
                             [nzButtonStyle]="'solid'">
@@ -59,6 +60,7 @@
                 ></nz-date-picker>
             </ng-container>
         </div>
+    </ng-container>
     <div nz-col nzSpan="3" class="search-input text-right">
         <button (click)="search()" nz-button nzType="default"><i class="anticon anticon-search" style="color: #6097b7"></i>搜索</button>
     </div>
@@ -71,7 +73,8 @@
         <div echarts [options]="chartOption"style="height: 400px;width: 100%"></div>
     </ng-container>
 </nz-spin>
-<nz-tabset [nzTabPosition]="'top'" [nzType]="'card'">
+<ng-container *ngIf="echartType == 'history'">
+    <nz-tabset [nzTabPosition]="'top'" [nzType]="'card'">
         <nz-tab  nzTitle="接收流量排行">
             <nz-table #nzTable [nzData]="inList" [nzLoading]="inLoading" [nzFrontPagination]="false" [nzTotal]="inTotalNum" [nzPageIndex]="inPageNum" [nzPageSize]="inPageCount" (nzPageIndexChange)="inChnagePage($event)">
                 <thead>
@@ -116,4 +119,6 @@
                 </tbody>
             </nz-table>
         </nz-tab>
-</nz-tabset>
+    </nz-tabset>
+</ng-container>
+

src/main/webapp/app/netTopology/model/line/line.component.ts

@@ -120,7 +120,7 @@ export class LineComponent implements OnInit {
                 this.totalNum = res.data.totalNum;
                 this.inList = res.data.data;
                 this.inList.forEach(e=>{   //进口流量回显
-                    if(e.itemId = this.itemId[0]){
+                    if(e.itemId == this.itemId[0]){
                         e.checked = true;
                     }
                 })
@@ -143,7 +143,7 @@ export class LineComponent implements OnInit {
                 this.totalNum = res.data.totalNum;
                 this.outList = res.data.data;
                 this.outList.forEach(e=>{
-                    if(e.itemId = this.itemId[1]){  //出口流量回显
+                    if(e.itemId == this.itemId[1]){  //出口流量回显
                         e.checked = true;
                     }
                 })

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

@@ -72,7 +72,7 @@
     <tr>
         <th [nzChecked]="allChecked"></th>
         <th>名称</th>
-        <th>告警状态</th>
+        <th>告警</th>
         <th>关联资产</th>
         <!--<th nzWidth="20%">主机启用状态</th>-->
         <th>可用性</th>

src/main/webapp/content/javascript/jtopo/js/jtopo-editor.js

@@ -84,7 +84,6 @@ TopologyPanel.prototype.loadTopology = function (response, topologyGuid, backImg
 TopologyPanel.prototype.loadTopologyByJson = function (topologyJson, backImg) {
     try {
         JTopo.replaceStageWithJson(topologyJson)
-        var timer = $interval(function(){},100,10);
         if (editor.stage && editor.scene && editor.scene.childs && editor.scene.childs.length > 0) {
             editor.stage.centerAndZoom()
             console.log(editor.utils.getAllNodes()[0]);