Skip to content

S
smart
Commit 2830ed68 authored by wangqinghua's avatar wangqinghua
Browse files
Options

兼容IE 选项卡

parent e50e08fa
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 58 deletions
README.md
View file @ 2830ed68
......@@ -39,6 +39,8 @@ Module ng g module my-module
版本更新：
v2.0.1 修复选择节点之后 流量查询不出来
****上传文件到服务器******
scp -r 22 build/www root@10.10.38.99:/home/nginx
scp -r 22 build/wx root@10.10.38.99:/home/nginx/www
src/main/webapp/app/business/effect-analysis/effect-analysis.component.html
View file @ 2830ed68
......@@ -72,7 +72,7 @@
</div>
</div>
</div>
<nz-tabset class="tabs-smart">
<nz-tabset class="tabs-smart" [nzType]="'card'">
<nz-tab nzTitle="网站监测">
<div style="min-height: 500px">
<ng-container *ngIf="noData">
......@@ -183,4 +183,4 @@
</nz-tab>
</nz-tabset>
</div>
</div>
\ No newline at end of file
</div>
src/main/webapp/app/home/home.component.html
View file @ 2830ed68
......@@ -181,7 +181,7 @@
</nz-col>
</nz-row>
<nz-row [nzGutter]="10">
<nz-col class="padding-10" nzSpan="16">
<nz-col class="padding-10" nzSpan="24">
<div class="host-item-title">网络拓扑图</div>
<div class="time-group" style="top: 18px;">
<nz-select style="width: 200px;" nzPlaceHolder="选择拓扑图" [(ngModel)]="topoId"
......@@ -195,20 +195,5 @@
<smart-topology-view #smartTopologyView></smart-topology-view>
</div>
</nz-col>
<nz-col class="padding-10" nzSpan="8">
<div class="host-item-title">业务系统安全运行天数</div>
<div class="host-item-table" style="height: 400px">
<nz-row class="text-center table-title">
<nz-col nzSpan="12">系统名称</nz-col>
<nz-col nzSpan="12">运行天数</nz-col>
</nz-row>
<ng-container *ngFor="let day of safeRunDayList;">
<nz-row class="table-content">
<nz-col nzSpan="12">{{day.name}}</nz-col>
<nz-col nzSpan="12">{{day.okTimeDay}}</nz-col>
</nz-row>
</ng-container>
</div>
</nz-col>
</nz-row>
</div>
src/main/webapp/app/home/home.component.ts
View file @ 2830ed68
......@@ -22,7 +22,7 @@ import {DatePipe} from '@angular/common';
]
})
export class HomeComponent implements OnInit, AfterViewInit {
export class HomeComponent implements OnInit {
@ViewChild('smartTopologyView') smartTopologyView: TopologyViewComponent;
color = color;
......@@ -37,7 +37,7 @@ export class HomeComponent implements OnInit, AfterViewInit {
{'label': '最近三天', value: '3'},
{'label': '最近一周', value: '4'},
];
timeTypeTrend;
timeTypeTrend = "0";
leftOneChart;
leftTwoChart;
......@@ -81,7 +81,6 @@ export class HomeComponent implements OnInit, AfterViewInit {
flowListNum; //接口流量排行 数值
flowListPre; //发送利用率排名 百分比
countOrderList; //cpu内存使用率排名列表
safeRunDayList; //安全运行天数
isTrendLoading = false;
......@@ -92,7 +91,6 @@ export class HomeComponent implements OnInit, AfterViewInit {
dataSet; //拓扑图
topoId;
isCanvas;
constructor(
private overAllSer: OverAllService, private message: NzMessageService,
......@@ -114,15 +112,9 @@ export class HomeComponent implements OnInit, AfterViewInit {
this.flowRankPre();
this.countOrde();
this.findSafeRunDay();
this.getList();
}
ngAfterViewInit() {
}
//获取分组
getGroup() {
this.overAllSer.findGroup().subscribe(
......@@ -561,20 +553,6 @@ export class HomeComponent implements OnInit, AfterViewInit {
);
}
//业务系统安全运行天数
findSafeRunDay() {
const data = {
pageNum: '1',
pageCount: '10',
startTime: '2018-01-01'
};
this.overAllSer.findSafeRunDayList(data).subscribe(
(res) => {
this.safeRunDayList = res.data.data;
}
);
}
changeTrend(e) {
this.timeTypeTrend = e;
this.isTrendLoading = true;
......
src/main/webapp/app/modal/alarm-modal/alarm-modal.component.html
View file @ 2830ed68
<!--告警推送-->
<nz-modal [nzWidth]="1080" [(nzVisible)]="isShow" [nzTitle]="title" (nzOnCancel)="handleEditCancel()" (nzOnOk)="handEditleOk()" [nzOkLoading]="isOkLoading">
<nz-tabset [(nzSelectedIndex)]="tabNum" (nzSelectedIndexChange)="tabsChange($event)" style="padding-bottom: 25px;min-height: 500px">
<nz-tabset [nzType]="'card'" [(nzSelectedIndex)]="tabNum" (nzSelectedIndexChange)="tabsChange($event)" style="padding-bottom: 25px;min-height: 500px">
<nz-tab nzTitle="选定告警目标">
<div nz-form class="ant-advanced-search-form form-select">
<nz-form-item>
......
src/main/webapp/app/modal/basic-edit/basic-edit.component.html
View file @ 2830ed68
<!--添加资源-->
<nz-modal [nzWidth]="1080" [(nzVisible)]="isBasicEdit" [nzTitle]="modalTitle" (nzOnCancel)="handleEditCancel()" (nzOnOk)="handEditleOk()" [nzOkLoading]="isOkLoading">
<nz-tabset [(nzSelectedIndex)]="tabNum" (nzSelectedIndexChange)="tabsChange($event)" style="padding-bottom: 25px;min-height: 500px">
<nz-tabset [(nzSelectedIndex)]="tabNum" [nzType]="'card'" (nzSelectedIndexChange)="tabsChange($event)" style="padding-bottom: 25px;min-height: 500px">
<nz-tab nzTitle="资源信息">
<div nz-form class="ant-advanced-search-form form-select">
<nz-form-item>
......@@ -232,7 +232,7 @@
全局值(配置)
</div>
</div>
<div nz-row [nzGutter]="12" *ngFor="let item of macroList2">
<div nz-row [nzGutter]="12" *ngFor="let item of macroList2;let i = index;">
<nz-form-control nz-col [nzOffset]="2" [nzSpan]="6">
<input nz-input placeholder="{$SNMP_COMMUNITY}" value="{{item.macro}}">
</nz-form-control>
......
src/main/webapp/app/modal/strategy/strategy.component.html
View file @ 2830ed68
<nz-modal [nzWidth]="880" [nzFooter]="null" [(nzVisible)]="isVisible" [nzTitle]="title" (nzOnCancel)="handleCancel()"
(nzOnOk)="handleOk()">
<nz-tabset [nzSelectedIndex]="tabNum" (nzSelectedIndexChange)="tabsChange($event)"
<nz-tabset [nzType]="'card'" [nzSelectedIndex]="tabNum" (nzSelectedIndexChange)="tabsChange($event)"
style="padding-bottom: 25px;min-height: 500px">
<nz-tab nzTitle="模版">
<div nz-form>
......
src/main/webapp/app/modal/website/website.component.html
View file @ 2830ed68
<nz-modal [nzWidth]="1080" [(nzVisible)]="isVisible" nzTitle="{{title}}" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()" [nzOkLoading]="isOkLoading">
<nz-tabset [nzSelectedIndex]="tabNum" (nzSelectedIndexChange)="tabsChange($event)" style="padding-bottom: 25px;min-height: 500px">
<nz-tabset [nzType]="'card'" [nzSelectedIndex]="tabNum" (nzSelectedIndexChange)="tabsChange($event)" style="padding-bottom: 25px;min-height: 500px">
<nz-tab nzTitle="1.场景">
<div nz-form class="ant-advanced-search-form form-select">
<form nz-form class="ant-advanced-search-form">
......@@ -318,4 +318,4 @@
</form>
</nz-tab>
</nz-tabset>
</nz-modal>
\ No newline at end of file
</nz-modal>
src/main/webapp/app/netTopology/model/line/line.component.html
View file @ 2830ed68
<!--进出口流量-->
<nz-modal [nzWidth]="780" [(nzVisible)]="isLine" nzTitle="流量配置" (nzOnCancel)="handleLineCancel()" (nzOnOk)="handleLineOk()">
<form nz-form>
<nz-tabset>
<nz-tabset [nzType]="'card'">
<nz-tab nzTitle="进流量">
<div class="padding-10">
<input (keyup.enter)="getInList()" name="inSearchName" style="width: 200px;" type="text" nz-input [(ngModel)]="inSearchName" placeholder="输入名称">
......@@ -58,4 +58,4 @@
</nz-tab>
</nz-tabset>
</form>
</nz-modal>
\ No newline at end of file
</nz-modal>
src/main/webapp/app/overAll/basic/basic-detail/basic-detail.component.html
View file @ 2830ed68
......@@ -50,7 +50,7 @@
{{checkStatus.disabled}}
</span>
</div>
<nz-tabset [nzSelectedIndex]="tabNum" class="tabs-smart">
<nz-tabset [nzType]="'card'" [nzSelectedIndex]="tabNum" class="tabs-smart">
<nz-tab nzTitle="资源详情">
<section>
<p class="padding-8-0">{{hostName}}</p>
......
src/main/webapp/app/overAll/network-check/network-detail/network-detail.component.html
View file @ 2830ed68
......@@ -27,7 +27,7 @@
<button (click)="showDeleteConfirm()" nz-button nzType="default">删除</button>
</div>
<div class="releative">
<nz-tabset class="tabs-smart ">
<nz-tabset class="tabs-smart" [nzType]="'card'">
<nz-tab nzTitle="监测信息">
<section>
<div nz-row nzGutter="24">
......
src/main/webapp/app/work/asset-part/assets-detail/assets-detail.component.html
View file @ 2830ed68
......@@ -29,7 +29,7 @@
<button (click)="showEditModal()" nz-button nzType="default">编辑</button>
<button (click)="deleteModal()" nz-button nzType="default">删除</button>
</div>
<nz-tabset class="tabs-smart ">
<nz-tabset [nzType]="'card'" class="tabs-smart ">
<nz-tab #thirdTabs nzTitle="资产信息">
<div nz-form class="ant-advanced-search-form form-select">
......@@ -255,4 +255,4 @@
<!--选择资源-->
<smart-select-group #smartSelectGroup (done)="setLink($event)"></smart-select-group>
<!--资产-->
<smart-assets #smartAssets (done)="getDetail()"></smart-assets>
\ No newline at end of file
<smart-assets #smartAssets (done)="getDetail()"></smart-assets>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment