Skip to content

S
smart
Commit 535fc572 authored by wangqinghua's avatar wangqinghua
Browse files
Options

update

parent 78c8fb15
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 36 deletions
README.md
View file @ 535fc572
......@@ -44,9 +44,9 @@ 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
git 命令：
git 命令：
创建分支 git checkout -b test
删除分支 git branch -D test
合并分支到master上面 git checkout --patch test
src/main/webapp/app/netTopology/ne-topology/ne-topology.component.html
View file @ 535fc572
......@@ -37,7 +37,8 @@
<div nz-row class="layui-layout layui-layout-admin header-bar">
<div nz-col nzSpan="12" class="layui-header ">
<ng-container *ngIf="editType == '只读模式'">
<nz-select style="width: 200px;" nzPlaceHolder="选择背景色" [(ngModel)]="backgroundColor" (ngModelChange)="changeColor()">
<nz-select style="width: 200px;" nzPlaceHolder="选择背景色" [(ngModel)]="backgroundColor"
(ngModelChange)="changeColor()">
<nz-option nzLabel="深蓝" nzValue="#3d76ab"></nz-option>
<nz-option nzLabel="白色" nzValue="#ffffff"></nz-option>
<nz-option nzLabel="淡绿" nzValue="#cadf91"></nz-option>
......@@ -45,12 +46,13 @@
<nz-option nzLabel="浅灰" nzValue="#c3c7c9"></nz-option>
</nz-select>
</ng-container>
<ng-container *ngIf="editType == '编辑模式'">
<ng-container *ngIf="editType == '编辑模式'">
<span (click)="addDevice()">添加设备</span>
<!--<span (click)="addCheck()">添加监测点</span>-->
<!--<span (click)="showAddImg()">添加图片</span>-->
<span onClick="editor.utils.deleteSelectedNodes()">移除</span>
<nz-select style="width: 200px;" nzPlaceHolder="选择线条" [(ngModel)]="lineType" (ngModelChange)="changeLine($event)">
<nz-select style="width: 200px;" nzPlaceHolder="选择线条" [(ngModel)]="lineType"
(ngModelChange)="changeLine($event)">
<nz-option nzLabel="直线" nzValue="1"></nz-option>
<nz-option nzLabel="折线(横向)" nzValue="2"></nz-option>
<nz-option nzLabel="折线(纵向)" nzValue="3"></nz-option>
......@@ -67,7 +69,7 @@
</ng-container>
<span aria-hidden="true" title="放大" onClick="editor.utils.scalingBig()">放大</span>
<span aria-hidden="true" title="缩小" onClick="editor.utils.scalingSmall()">缩小</span>
<span aria-hidden="true" title="全屏查看" onClick="editor.utils.showInFullScreen(editor.stage.canvas,'RequestFullScreen')">全屏查看</span>
<span aria-hidden="true" title="全屏查看" (click)="toFull()">全屏查看</span>
<span aria-hidden="true" title="居中显示" onClick="editor.utils.showInCenter()">居中显示</span>
<ng-container *ngIf="editType == '只读模式'">
<span aria-hidden="true" title="编辑" (click)="changeEdit('编辑模式')">切换编辑模式</span>
......@@ -77,31 +79,31 @@
</ng-container>
</div>
</div>
<div class="topo-container">
<div class="layui-row">
<div class="layui-col-md12">
<div #topologyBody id="topology-body" class="topology-context">
<!-- 鼠标悬浮显示节点信息 -->
<div class="node-infobox" style="display: none;">
<span>节点名称：<label name="node_name"></label></span>
<span>当前时间：<label name="current_time"></label></span>
</div>
<canvas class="topology-context" id="topology-canvas" width="1190" height="520" #topologyCanvas>
您的浏览器不支持HTML5!
</canvas>
<div class="lineList">
{{editType}}
</div>
<div class="loading">
<nz-spin nzTip='获取拓扑图...' [nzSpinning]="isLoading">
</nz-spin>
</div>
<div class="checkList">
<p *ngFor="let item of checkJson;let i = index;">
<span [style.fontSize]="item.fontSize +'px'">{{item.name}}</span><i (click)="deleteCheck(i)" class="minus anticon anticon-minus-circle-o"></i>
</p>
</div>
</div>
<div class="topo-container" #topoContainer>
<div #topologyBody id="topology-body" class="topology-context">
<!-- 鼠标悬浮显示节点信息 -->
<div class="node-infobox" style="display: none;">
<span>节点名称：<label name="node_name"></label></span>
<span>当前时间：<label name="current_time"></label></span>
</div>
<canvas class="topology-context" id="topology-canvas" width="1190" height="520" #topologyCanvas>
您的浏览器不支持HTML5!
</canvas>
<div (click)="exitFull()" *ngIf="isFull" style="left: 20px;" class="lineList">
退出全屏
</div>
<div class="lineList">
{{editType}}
</div>
<div class="loading">
<nz-spin nzTip='获取拓扑图...' [nzSpinning]="isLoading">
</nz-spin>
</div>
<div class="checkList">
<p *ngFor="let item of checkJson;let i = index;">
<span [style.fontSize]="item.fontSize +'px'">{{item.name}}</span><i (click)="deleteCheck(i)"
class="minus anticon anticon-minus-circle-o"></i>
</p>
</div>
</div>
</div>
......
src/main/webapp/app/overAll/network-check/network-check.component.html
View file @ 535fc572
......@@ -59,7 +59,7 @@
</div>
</div>
<nz-table #nzTable [nzData]="dataSet" [nzLoading]="loading" [nzTotal]="totalNum" [nzPageIndex]="pageIndex"
[nzPageSize]="pageSize" (nzPageIndexChange)="getwebList()" [nzFrontPagination]="false">
[nzPageSize]="pageSize" (nzPageIndexChange)="change($event)" [nzFrontPagination]="false">
<thead>
<tr>
<th [nzChecked]="allChecked"></th>
......@@ -124,4 +124,4 @@
<smart-pause #smartPause (done)="getwebList()"></smart-pause>
<!--告警-->
<smart-alarm-modal #smartAlarmModal></smart-alarm-modal>
\ No newline at end of file
<smart-alarm-modal #smartAlarmModal></smart-alarm-modal>
src/main/webapp/app/overAll/network-check/network-check.component.ts
View file @ 535fc572
......@@ -55,6 +55,11 @@ export class NetworkCheckComponent implements OnInit {
this.getCheckStatus();
}
change(e){
this.pageIndex = e;
this.getwebList();
}
//网站列表
getwebList() {
this.loading = true;
......
src/main/webapp/content/scss/darkBlue.scss
View file @ 535fc572
......@@ -189,6 +189,6 @@ $fontColor: #b7d1f1;
}
.topology-context {
background: rgba(0, 0, 0, 0.2);
background: rgb(61, 118, 171);
}
}
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