Merge remote-tracking branch 'origin/master'

README.md

@@ -34,4 +34,8 @@ Module	ng g module my-module
               业务拓扑 bTopology
               效能分析 effectAnalysis
               日志分析 logAnalysis
-              业务配置 bConfig
+              业务配置 bConfig
\ No newline at end of file
+
+
+版本更新：
+v2.0.1  修复选择节点之后 流量查询不出来
\ No newline at end of file

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

@@ -31,7 +31,7 @@
 </div>
 <div class="tag-warn tag-form handle">
     <ng-container *ngFor="let item of warnCountList">
-        <span [ngClass]="{'select-border': selectHostId == item.hostid}" (click)="search(item.hostid)">
+        <span style="color: #799bf2" [ngClass]="{'select-border': selectHostId == item.hostid}" (click)="search(item.hostid)">
             <nz-tag *ngIf="item.level == 4 || item.level == 5" class="tag-red" [nzColor]="color.red"></nz-tag>
             <nz-tag *ngIf="item.level == 2 || item.level == 3" class="tag-yellow" [nzColor]="color.yellow"></nz-tag>
             {{item.name}}({{item.size}})

src/main/webapp/app/analysis/operation-work/analysis-deal/analysis-deal.component.ts

@@ -73,7 +73,14 @@ export class AnalysisDealComponent implements OnInit {
                 type: 'category',
                 data: this.dealList.map(e => {
                     return e.username;
-                })
+                }),
+                axisLabel: {
+                    textStyle: {
+                        color: '#bac0c0',
+                        fontWeight: 'normal',
+                        fontSize: '12',
+                    },
+                },
             },
             yAxis: {
                 type: 'value',
@@ -81,7 +88,12 @@ export class AnalysisDealComponent implements OnInit {
                 axisLabel: {
                     show: true,
                     interval: 'auto',
-                    formatter: '{value} 个'
+                    formatter: '{value} 个',
+                    textStyle: {
+                        color: '#bac0c0',
+                        fontWeight: 'normal',
+                        fontSize: '12',
+                    },
                 },
                 boundaryGap: [0, 0.1],
             },

src/main/webapp/app/analysis/operation-work/analysis-event/analysis-event.component.ts

@@ -74,7 +74,14 @@ export class AnalysisEventComponent implements OnInit {
                 type: 'category',
                 data: this.eventList.map(e => {
                     return e.typeName;
-                })
+                }),
+                axisLabel: {
+                    textStyle: {
+                        color: '#bac0c0',
+                        fontWeight: 'normal',
+                        fontSize: '12',
+                    },
+                },
             },
             yAxis: {
                 type: 'value',
@@ -82,7 +89,12 @@ export class AnalysisEventComponent implements OnInit {
                 axisLabel: {
                     show: true,
                     interval: 'auto',
-                    formatter: '{value} 个'
+                    formatter: '{value} 个',
+                    textStyle: {
+                        color: '#bac0c0',
+                        fontWeight: 'normal',
+                        fontSize: '12',
+                    },
                 },
                 boundaryGap: [0, 0.1],
             },

src/main/webapp/app/analysis/operation-work/analysis-status/analysis-status.component.ts

@@ -72,7 +72,14 @@ export class AnalysisStatusComponent implements OnInit {
                 type: 'category',
                 data: this.statusList.map(e => {
                     return e.operateStatusName;
-                })
+                }),
+                axisLabel: {
+                    textStyle: {
+                        color: '#bac0c0',
+                        fontWeight: 'normal',
+                        fontSize: '12',
+                    },
+                },
             },
             yAxis: {
                 type: 'value',
@@ -80,7 +87,12 @@ export class AnalysisStatusComponent implements OnInit {
                 axisLabel: {
                     show: true,
                     interval: 'auto',
-                    formatter: '{value} 个'
+                    formatter: '{value} 个',
+                    textStyle: {
+                        color: '#bac0c0',
+                        fontWeight: 'normal',
+                        fontSize: '12',
+                    },
                 },
                 boundaryGap: [0, 0.1],
             },

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

@@ -85,7 +85,7 @@
 </nz-spin>
 <div nz-row  nzGutter="4" style="margin: 20px 0">
     <div nz-col  nzSpan="20">
-        <h3>常见问题TOP10</h3>
+        <h3 class="color-999">常见问题TOP10</h3>
     </div>
     <div nz-col nzSpan="4" class="text-right">
             <button [nzLoading]="isDownload1" (click)="downLoadCommon()" nz-button nzType="default"><i class="anticon anticon-download"></i>下载</button>
@@ -115,7 +115,7 @@
 </nz-table>
 <div nz-row  nzGutter="4" style="margin: 20px 0">
     <div nz-col  nzSpan="20">
-        <h3>统计报告</h3>
+        <h3 class="color-999">统计报告</h3>
     </div>
     <div nz-col nzSpan="4" class="text-right">
             <button [nzLoading]="isDownload2" (click)="downLoadReport()" nz-button nzType="default"><i class="anticon anticon-download"></i>下载</button>

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

@@ -95,7 +95,12 @@ export class ResourceUsabilComponent implements OnInit {
     setTopEcharts(){
         this.chartTopOption = {
             title: {
-                text: '可用性TOP 10'
+                text: '可用性TOP 10',
+                textStyle: {
+                    fontWeight: 'normal',
+                    fontSize: 24,
+                    color: "#fff",
+                }
             },
             tooltip : {
                 trigger: 'axis',
@@ -109,6 +114,13 @@ export class ResourceUsabilComponent implements OnInit {
                 data: this.topList.map(e=>{
                     return e.name;
                 }),
+                axisLabel: {
+                    textStyle: {
+                        color: '#bac0c0',
+                        fontWeight: 'normal',
+                        fontSize: '12',
+                    },
+                },
 
             },
             yAxis: {
@@ -116,7 +128,13 @@ export class ResourceUsabilComponent implements OnInit {
                 axisLabel: {
                     show: true,
                     interval: 'auto',
-                    formatter: '{value} %'
+                    formatter: '{value} %',
+
+                        textStyle: {
+                            color: '#bac0c0',
+                            fontWeight: 'normal',
+                            fontSize: '12',
+                        },
                 },
             },
             series: [{
@@ -157,7 +175,12 @@ export class ResourceUsabilComponent implements OnInit {
     setLastEcharts(){
         this.chartLastOption = {
             title: {
-                text: '可用性LAST 10'
+                text: '可用性LAST 10',
+                textStyle: {
+                    fontWeight: 'normal',
+                    fontSize: 24,
+                    color: "#fff",
+                }
             },
             tooltip : {
                 trigger: 'axis',
@@ -170,14 +193,26 @@ export class ResourceUsabilComponent implements OnInit {
                 type: 'category',
                 data: this.lastList.map(e=>{
                     return e.name;
-                })
+                }),
+                axisLabel: {
+                    textStyle: {
+                        color: '#bac0c0',
+                        fontWeight: 'normal',
+                        fontSize: '12',
+                    },
+                },
             },
             yAxis: {
                 type: 'value',
                 axisLabel: {
                     show: true,
                     interval: 'auto',
-                    formatter: '{value} %'
+                    formatter: '{value} %',
+                    textStyle: {
+                        color: '#bac0c0',
+                        fontWeight: 'normal',
+                        fontSize: '12',
+                    },
                 },
             },
             series: [{

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

@@ -13,5 +13,6 @@ export class AppComponent {
             event.preventDefault();
             event.stopPropagation();
         }
+        console.log("智能运行监管平台：v2.0.1 update By 2019-04-01")
     }
 }

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

@@ -17,7 +17,7 @@
         <div class="leftDiv">
             <div #leftDiv class="leftDiv-container">
                 <div nz-row class="padding-10">
-                    <div nz-col nzSpan="12"> <h2>运行情况统计</h2></div>
+                    <div nz-col nzSpan="12"> <h2 style="color: #999999">运行情况统计</h2></div>
                     <div nz-col nzSpan="12">
                         <nz-select style="width: 200px;float: right" nzPlaceHolder="选择分组" [(ngModel)]="obj.leftGroupId" (ngModelChange)="countGroupItem()">
                             <ng-container *ngFor="let item of groupList;let i = index;">
@@ -78,14 +78,14 @@
         </div>
     </div>
     <div #rightDiv nz-col nzSpan="8" class="rightDiv">
-        <h2>资源数量统计<span><span class="main-color-font">{{deviceNo}}</span>个资源</span></h2>
+        <h2 style="color: #999999">资源数量统计<span><span class="main-color-font">{{deviceNo}}</span>个资源</span></h2>
         <div echarts [options]="rightOneChart" style="height: 250px;width: 100%"></div>
         <div echarts [options]="rightTwoChart" style="height: 250px;width: 100%"></div>
     </div>
 </div>
 <div nz-row class="padding-15-0">
     <div nz-col nzSpan="12">
-        <h2>当前告警</h2>
+        <h2 class="color-999">当前告警</h2>
     </div>
     <div nz-col nzSpan="12" class="text-right">
         <nz-select style="width: 200px;" nzPlaceHolder="选择分组" [(ngModel)]="obj.alarmGroupId"
@@ -124,7 +124,7 @@
 </nz-table>
 <div nz-row class="padding-15-0">
     <div nz-col nzSpan="12">
-        <h2>关注资源</h2>
+        <h2 class="color-999">关注资源</h2>
     </div>
     <div nz-col nzSpan="12" class="text-right">
         <button nz-button nzType="default" (click)="showAddFollow()"><i class="anticon anticon-plus-circle-o"></i>添加资源
@@ -133,7 +133,7 @@
 </div>
 <div nz-row>
     <ng-container *ngFor="let item of followList;let i = index;">
-        <div nz-col nzSpan="12" class="follow">
+        <div nz-col nzSpan="12" class="follow color-999">
             <span (click)="cancel(i,item)" class="cursor calcle-follow"><i
                     class="anticon anticon-close-circle"></i></span>
             <div class="follow-container">

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

@@ -334,7 +334,7 @@ export class HomeComponent implements OnInit,AfterViewInit {
                     y: '40%',
                     itemGap: 50,
                     textStyle: {
-                        color: '#333',
+                        color: '#f999',
                         fontSize: 18,
                         fontWeight: 'normal',
                     },
@@ -421,7 +421,7 @@ export class HomeComponent implements OnInit,AfterViewInit {
                     y: '40%',
                     itemGap: 50,
                     textStyle: {
-                        color: '#333',
+                        color: '#999',
                         fontSize: 18,
                         fontWeight: 'normal',
                     },

src/main/webapp/app/home/home.css

@@ -18,6 +18,7 @@ p {
 }
 .flex-item > p{
     margin: 10px 0;
+    color: #ffffff;
 }
 
 .leftDiv {

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

@@ -12,7 +12,7 @@ import {CommonService} from '../../shared/common/common.service';
     styles:[`
     .container{
         margin: 0 16px;
-        background-color: #fff;
+        background-color: #171a2f;
     }
     `]
 })
@@ -32,7 +32,7 @@ export class JhiMainComponent implements OnInit {
     ) {}
 
     private getPageTitle(routeSnapshot: ActivatedRouteSnapshot) {
-        let title: string = (routeSnapshot.data && routeSnapshot.data['pageTitle']) ? routeSnapshot.data['pageTitle'] : '智能监控';
+        let title: string = (routeSnapshot.data && routeSnapshot.data['pageTitle']) ? routeSnapshot.data['pageTitle'] : '智能运维监管平台';
         if (routeSnapshot.firstChild) {
             title = this.getPageTitle(routeSnapshot.firstChild) || title;
         }

src/main/webapp/app/layouts/navbar/navbar.component.html

-<nz-header  style="background: #fff; padding:0 16px;border-bottom: 1px solid #e5e5e5">
+<nz-header  style="padding:0 16px;">
     <div nz-row>
         <div nz-col class="handle" [nzSpan]="12">
-            <a class="main-color margin-right-10" routerLink="../main/home">首页</a>
-            <a href="http://10.100.0.7:8181/#/autologin?password=MSC2FFR62REPRM6AF03F432D3071DBB&username=tjfx&security=1" target="_blank" class="main-color margin-right-10">安防设备监控</a>
-            <span style="color: #666666" (click)="transition()">快捷添加 +</span>
+            <a style="color: #799bf2" class="margin-right-10" routerLink="../main/home">首页</a>
+            <a style="color: #799bf2" href="http://10.100.0.7:8181/#/autologin?password=MSC2FFR62REPRM6AF03F432D3071DBB&username=tjfx&security=1" target="_blank" class="main-color margin-right-10">安防设备监控</a>
+            <span style="color: #799bf2" (click)="transition()">快捷添加 +</span>
             <span #parent  class="span-hov">
               <span #children class="addBtn">
                 <span (click)="showGroupModal()">添加设备分组</span>
@@ -14,7 +14,7 @@
         </div>
         <div nz-col [nzSpan]="12" style="text-align: right">
             <nz-dropdown [nzTrigger]="'click'">
-                <a nz-dropdown>{{user.loginName}}<i class="anticon anticon-down"></i>
+                <a nz-dropdown style="color: #cccac3">{{user.loginName}}<i class="anticon anticon-down"></i>
                 </a>
                 <ul nz-menu>
                     <li (click)="showPasswordModal()" nz-menu-item>修改密码</li>

src/main/webapp/app/netTopology/ne-topology/ne-topology.component.ts

@@ -147,7 +147,6 @@ export class NeTopologyComponent implements OnInit, DoCheck, AfterViewInit, OnDe
         myCanvas.width = myCanvas.width * ratio;
         myCanvas.height = myCanvas.height * ratio;
         context.scale(ratio,ratio);
-        // context.translate(-(canvasWidth/2),-(canvasHeight/2));
 
         editor.loadTopology('','', 'img/backimg.png',canvasWidth,canvasHeight);
     }
@@ -276,14 +275,14 @@ export class NeTopologyComponent implements OnInit, DoCheck, AfterViewInit, OnDe
         this.smartSelectRadioGroup.showAddModal('添加设备');
     }
 
-    //获取设备图片
+    //获取节点信息
     setImg(e) {
         const data = {
             hostIds:[e]
         }
         this.topologySer.findByHostIdOrWeb(data).subscribe(
             (res)=>{
-                editor.utils.addNode(res.data[0].url, res.data[0].name,e[0]);
+                editor.utils.addNode(res.data[0].url, res.data[0].name,res.data[0].hostId);
             }
         )
     }

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

@@ -210,7 +210,7 @@
                                 <td></td>
                                 <td [nzIndentSize]="item.level*20" nzShowExpand [nzExpand]='item.expand'
                                     (nzExpandChange)="getChildren(item)">
-                                    <span>{{item.name}} <span style="color: #1b6b5b; margin-left: 10px">主机数量：{{item.hostcount}}</span> </span>
+                                    <span>{{item.name}} <span style="color: #24a9a1; margin-left: 10px">主机数量：{{item.hostcount}}</span> </span>
                                 </td>
                             </ng-container>
                             <!--子集-->

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

@@ -61,7 +61,7 @@
               <td></td>
               <td class="cursor" [nzIndentSize]="item.level*20" nzShowExpand [nzExpand]='item.expand'
                   (nzExpandChange)="getChildren(item)">
-                <span>{{item.name}}</span> <span style="color: #1b6b5b; margin-left: 10px">模版数量：{{item.templatescount}}</span>
+                <span>{{item.name}}</span> <span style="color: #24a9a1; margin-left: 10px">模版数量：{{item.templatescount}}</span>
               </td>
               <td>{{item.description}}</td>
               <td></td>

src/main/webapp/app/shared/common/common.service.ts

@@ -21,6 +21,13 @@ export class CommonService implements OnInit {
         return false;
     }
 
+    /**
+     * list一层数组转为树形结构的数组
+     * @param myId   父级ID
+     * @param pId   子级ID
+     * @param list
+     * @returns {any[]}
+     */
     listToTree(myId,pId,list){
         const  nodes = [];
         for(let i=0; i<list.length; i++){
@@ -52,6 +59,11 @@ export class CommonService implements OnInit {
         return nodes;
     }
 
+    /**
+     * JSON格式数据转化为字符串 接口调用
+     * @param data  json格式的数据
+     * @returns {string}
+     */
     toQuery(data){
         let str = '';
         for (let key in data) {

src/main/webapp/app/system/group/group.component.html

@@ -34,7 +34,7 @@
     <nz-tree [(ngModel)]="nodes">
       <ng-template #nzTreeTemplate let-node>
         <span class="custom-node" draggable="true" aria-grabbed="true" [class.active]="node.isSelected">
-          <span>
+          <span class="color-999">
            <span (click)="getOrg(node)">{{node.title}} </span>
             <i (click)="showEditGroupModal(node)" style="margin:0 10px 0 20px;" class="anticon anticon-form"></i>
             <i (click)="deleteGroup(node)" class="anticon anticon-close-circle-o"></i>

src/main/webapp/app/work/pararms/pararms.component.html

@@ -18,7 +18,7 @@
     <smart-full-screen></smart-full-screen>
   </div>
 </div>
-<div class="content-params">
+<div class="content-params color-999">
   <div nz-row>
     <div nz-col class="text-right" nzSpan="3">
       事件编号前缀

src/main/webapp/content/css/documentation.css

@@ -18,14 +18,16 @@
     text-align: center;
     font-size: 20px;
     font-weight: 500;
-    padding: 20px 0;
+    height: 65px;
+    line-height: 65px;
+    background-color: #192b70;
 }
 .breadcrumbs{
     padding: 10px 0;
 }
 .search-form{
     padding: 15px 0;
-    border-top: 1px solid #dddddd;
+    color: #799bf2;
 }
 .search-form .ant-input{
     width: 100%;
@@ -113,10 +115,10 @@
 }
 
  .layout .ant-menu, .layout .ant-menu-submenu > .ant-menu{
-    background-color: #414852;
+    background-color: #1a1f3b;
 }
  .ant-layout-sider{
-    background: #414852;
+    background: #171a2f;
 }
 .ant-menu-inline .ant-menu-submenu-title{
     color: #bcc9d8;
@@ -131,7 +133,7 @@
     color: #fff;
 }
 .ant-layout{
-    background-color: #fff;
+    background-color: #171a2f;
 }
 .ant-table-thead > tr > th{
     color: #4d4d4d;
@@ -144,14 +146,14 @@
     border-bottom: 1px solid #e5e5e5;
 }
 .ant-btn .anticon{
-    color: #6097b7;
+    color: #ffffff;
 }
 .color-fff{
     color: #ffffff !important;
 }
 .breadcrumbs .ant-btn-primary{
-    background-color: #6097b7;
-    border-color: #6097b7;
+    background-color: #4d64b8;
+    border-color: #4d64b8;
 }
 .breadcrumbs .ant-btn .anticon{
     color: #ffffff;
@@ -191,4 +193,97 @@
     border-radius: 4px;
     padding: 2px 5px;
     cursor: pointer;
-}
+}
\ No newline at end of file
+.ant-layout-header{
+    height: 65px;
+    line-height: 65px;
+    background-color: #192b70 !important;
+}
+.ant-tabs,
+.ant-breadcrumb-separator,
+.ant-breadcrumb a,
+.ant-select-arrow,
+.ant-breadcrumb{
+    color: #799bf2;
+}
+.ant-select-selection{
+    background-color: #202641;
+    color: #799bf2;
+    border: 1px solid #799bf2;
+}
+.ant-input{
+    background-color: #202641;
+    color: #799bf2;
+    border: 1px solid #799bf2;
+}
+.ant-btn:hover, .ant-btn:focus, .ant-btn:active, .ant-btn.active,
+.ant-btn{
+    background-color: #3355d4;
+    border: 1px solid #3355d4;
+    color: #fff;
+}
+.ant-collapse,
+.ant-table-thead > tr > th{
+    background-color: #171a2f;
+    color: #7e90ba;
+}
+.ant-table-row-expand-icon{
+    background-color: #405863;
+    color: #ffffff;
+    border: 1px solid #e8e8e8;
+}
+.ant-radio-button-wrapper,
+.ant-select-dropdown-menu-item,
+.ant-select-dropdown-menu-item-selected{
+    background-color: #2c4552;
+    color: #799bf2;
+    border: 1px solid #799bf2;
+}
+.ant-select-dropdown-menu-item-selected:hover,
+.ant-select-dropdown-menu-item:hover{
+    background-color: #455d69;
+    color:#799bf2;
+}
+.ant-table-thead > tr.ant-table-row-hover > td, .ant-table-tbody > tr.ant-table-row-hover > td, .ant-table-thead > tr:hover > td, .ant-table-tbody > tr:hover > td{
+    background-color: #405863;
+}
+.ant-table{
+    color: #7e90ba;
+}
+.ant-table-thead > tr > th,
+.ant-table-tbody > tr > td{
+    border-bottom: 1px solid #666666;
+}
+.ant-breadcrumb-link{
+    color: #ffffff;
+}
+.default .ant-tag{
+    background-color: #8e90a3;
+    /*color: #4f4f50;*/
+}
+.ant-pagination-disabled a, .ant-pagination-disabled:hover a, .ant-pagination-disabled:focus a, .ant-pagination-disabled .ant-pagination-item-link, .ant-pagination-disabled:hover .ant-pagination-item-link, .ant-pagination-disabled:focus .ant-pagination-item-link{
+    border: 1px solid #555c7a;
+}
+.ant-pagination-prev .ant-pagination-item-link, .ant-pagination-next .ant-pagination-item-link,
+.ant-pagination-item{
+    background-color: #21294c;
+}
+.ant-pagination-next .ant-pagination-item-link:after,
+.ant-pagination-prev .ant-pagination-item-link:after{
+    color: #ffffff;
+}
+.ant-pagination-item a{
+    color: #bec4d0;
+}
+.ant-table-placeholder{
+    background: #253035;
+    color: #cac8c8;
+    border-bottom:none;
+}
+.ant-input::-webkit-input-placeholder{
+    color: #576380;
+}
+.ant-dropdown-menu{
+    background-color: #647386;
+}
+.color-999{color: #ffffff}
\ No newline at end of file