Skip to content

S
smart
Commit 8c470159 authored by wangqinghua's avatar wangqinghua
Browse files
Options

兼容性测试

parent 5398685c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 67 deletions
src/main/webapp/app/netTopology/ne-topology/ne-topology.component.html
View file @ 8c470159
...@@ -34,73 +34,75 @@ ...@@ -34,73 +34,75 @@
</div> </div>
</div> </div>
<div nz-row class="layui-layout layui-layout-admin header-bar"> <div class="canvas-topo" #canvasTopo>
<div nz-col nzSpan="12" class="layui-header "> <div nz-row class="layui-layout layui-layout-admin header-bar">
<ng-container *ngIf="editType == '只读模式'"> <div nz-col nzSpan="12" class="layui-header ">
<nz-select style="width: 200px;" nzPlaceHolder="选择背景色" [(ngModel)]="backgroundColor" (ngModelChange)="changeColor()"> <ng-container *ngIf="editType == '只读模式'">
<nz-option nzLabel="深蓝" nzValue="#3d76ab"></nz-option> <nz-select style="width: 200px;" nzPlaceHolder="选择背景色" [(ngModel)]="backgroundColor"
<nz-option nzLabel="白色" nzValue="#ffffff"></nz-option> (ngModelChange)="changeColor()">
<nz-option nzLabel="淡绿" nzValue="#cadf91"></nz-option> <nz-option nzLabel="深蓝" nzValue="#3d76ab"></nz-option>
<nz-option nzLabel="棕色" nzValue="#cbb492"></nz-option> <nz-option nzLabel="白色" nzValue="#ffffff"></nz-option>
<nz-option nzLabel="浅灰" nzValue="#c3c7c9"></nz-option> <nz-option nzLabel="淡绿" nzValue="#cadf91"></nz-option>
</nz-select> <nz-option nzLabel="棕色" nzValue="#cbb492"></nz-option>
</ng-container> <nz-option nzLabel="浅灰" nzValue="#c3c7c9"></nz-option>
<ng-container *ngIf="editType == '编辑模式'"> </nz-select>
<span (click)="addDevice()">添加设备</span> </ng-container>
<!--<span (click)="addCheck()">添加监测点</span>--> <ng-container *ngIf="editType == '编辑模式'">
<!--<span (click)="showAddImg()">添加图片</span>--> <span (click)="addDevice()">添加设备</span>
<span onClick="editor.utils.deleteSelectedNodes()">移除</span> <!--<span (click)="addCheck()">添加监测点</span>-->
<nz-select style="width: 200px;" nzPlaceHolder="选择线条" [(ngModel)]="lineType" (ngModelChange)="changeLine($event)"> <!--<span (click)="showAddImg()">添加图片</span>-->
<nz-option nzLabel="直线" nzValue="1"></nz-option> <span onClick="editor.utils.deleteSelectedNodes()">移除</span>
<nz-option nzLabel="折线(横向)" nzValue="2"></nz-option> <nz-select style="width: 200px;" nzPlaceHolder="选择线条" [(ngModel)]="lineType"
<nz-option nzLabel="折线(纵向)" nzValue="3"></nz-option> (ngModelChange)="changeLine($event)">
<nz-option nzLabel="二次折线(横向)" nzValue="4"></nz-option> <nz-option nzLabel="直线" nzValue="1"></nz-option>
<nz-option nzLabel="二次折线(纵向)" nzValue="5"></nz-option> <nz-option nzLabel="折线(横向)" nzValue="2"></nz-option>
</nz-select> <nz-option nzLabel="折线(纵向)" nzValue="3"></nz-option>
</ng-container> <nz-option nzLabel="二次折线(横向)" nzValue="4"></nz-option>
</div> <nz-option nzLabel="二次折线(纵向)" nzValue="5"></nz-option>
<!-- 顶部工具栏 --> </nz-select>
<div nz-col nzSpan="12" class="layui-nav layui-layout-right"> </ng-container>
<ng-container *ngIf="editType == '编辑模式'"> </div>
<span aria-hidden="true" title="保存" (click)="update()">保存</span> <!-- 顶部工具栏 -->
<span aria-hidden="true" title="清空" onClick="editor.utils.clearTopology()">清空</span> <div nz-col nzSpan="12" class="layui-nav layui-layout-right">
</ng-container> <ng-container *ngIf="editType == '编辑模式'">
<span aria-hidden="true" title="放大" onClick="editor.utils.scalingBig()">放大</span> <span aria-hidden="true" title="保存" (click)="update()">保存</span>
<span aria-hidden="true" title="缩小" onClick="editor.utils.scalingSmall()">缩小</span> <span aria-hidden="true" title="清空" onClick="editor.utils.clearTopology()">清空</span>
<span aria-hidden="true" title="全屏查看" onClick="editor.utils.showInFullScreen(editor.stage.canvas,'RequestFullScreen')">全屏查看</span> </ng-container>
<span aria-hidden="true" title="居中显示" onClick="editor.utils.showInCenter()">居中显示</span> <span aria-hidden="true" title="放大" onClick="editor.utils.scalingBig()">放大</span>
<ng-container *ngIf="editType == '只读模式'"> <span aria-hidden="true" title="缩小" onClick="editor.utils.scalingSmall()">缩小</span>
<span aria-hidden="true" title="编辑" (click)="changeEdit('编辑模式')">切换编辑模式</span> <span *ngIf="!isFull" aria-hidden="true" title="全屏查看" (click)="fullCanvas()">全屏查看</span>
</ng-container> <span *ngIf="isFull" aria-hidden="true" title="全屏查看" (click)="exitFull()">退出全屏</span>
<ng-container *ngIf="editType == '编辑模式'"> <span aria-hidden="true" title="居中显示" onClick="editor.utils.showInCenter()">居中显示</span>
<span aria-hidden="true" title="只读" (click)="changeEdit('只读模式')">切换只读模式</span> <ng-container *ngIf="editType == '只读模式'">
</ng-container> <span aria-hidden="true" title="编辑" (click)="changeEdit('编辑模式')">切换编辑模式</span>
</ng-container>
<ng-container *ngIf="editType == '编辑模式'">
<span aria-hidden="true" title="只读" (click)="changeEdit('只读模式')">切换只读模式</span>
</ng-container>
</div>
</div> </div>
</div> <div class="topo-container">
<div class="topo-container"> <div #topologyBody id="topology-body">
<div class="layui-row"> <!-- 鼠标悬浮显示节点信息 -->
<div class="layui-col-md12"> <div class="node-infobox" style="display: none;">
<div #topologyBody id="topology-body" class="topology-context"> <span>节点名称：<label name="node_name"></label></span>
<!-- 鼠标悬浮显示节点信息 --> <span>当前时间：<label name="current_time"></label></span>
<div class="node-infobox" style="display: none;"> </div>
<span>节点名称：<label name="node_name"></label></span> <canvas class="topology-context" id="topology-canvas" width="1190" #topologyCanvas>
<span>当前时间：<label name="current_time"></label></span> 您的浏览器不支持HTML5!
</div> </canvas>
<canvas class="topology-context" id="topology-canvas" width="1190" height="520" #topologyCanvas> <div class="lineList">
您的浏览器不支持HTML5! {{editType}}
</canvas> </div>
<div class="lineList"> <div class="loading">
{{editType}} <nz-spin nzTip='获取拓扑图...' [nzSpinning]="isLoading">
</div> </nz-spin>
<div class="loading"> </div>
<nz-spin nzTip='获取拓扑图...' [nzSpinning]="isLoading"> <div class="checkList">
</nz-spin> <p *ngFor="let item of checkJson;let i = index;">
</div> <span [style.fontSize]="item.fontSize +'px'">{{item.name}}</span><i (click)="deleteCheck(i)"
<div class="checkList"> class="minus anticon anticon-minus-circle-o"></i>
<p *ngFor="let item of checkJson;let i = index;"> </p>
<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>
</div> </div>
</div> </div>
......
src/main/webapp/content/scss/darkBlue.scss
View file @ 8c470159
...@@ -189,6 +189,6 @@ $fontColor: #b7d1f1; ...@@ -189,6 +189,6 @@ $fontColor: #b7d1f1;
} }
.topology-context { .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